Switch from `insta` to `expect-test` in bootstrap by Kobzol · Pull Request #164856 · rust-lang/rust

Kobzol · 2026-10-24T14:42:52Z

While I like insta a bit more for snapshot tests, it has a disadvantage that it requires installing a separate binary (cargo insta) for blessing inline snapshot tests. That is not very intuitive for people who need to bless inline bootstrap snapshots, and then realize that x test bootstrap --bless does nothing.

This PR switches from insta to expect-test, which allows updating inline snapshots via an environment variable while running cargo test, without requiring a separate binary. expect-test is a rust-lang (well, rust-analyzer) repository, so we should be good there, and it even removes two dev dependencies from bootstrap.

Changing the inline snapshots was a bit non-trivial to do with a regex (at least in my IDE) because we have to switch the argument order, which is not that simple across multiple lines. So I decided to try https://github.com/ast-grep/ast-grep. I used an LLM to propose the initial rewrite rule, and then modified it slightly and ran ast-grep to update the code. The applied rule was this:

id: insta-to-expect-test
language: rust
rule:
  pattern: insta::assert_snapshot!($$$ARGS)
transform:
  LHS:
    replace:
      source: $$$ARGS
      replace: '(?s)^(?<lhs>.*?),\s*@(?<rhs>.*?)\s*,?\s*$'
      by: '${lhs}'
  RHS:
    replace:
      source: $$$ARGS
      replace: '(?s)^(?<lhs>.*?),\s*@(?<rhs>.*?)\s*,?\s*$'
      by: '${rhs}'
fix: expect_test::expect![[$RHS]].assert_eq(&$LHS)

You can test it in the ast-grep playground.

I used double brackets because it formatted better (IMO) with x fmt. Most of the diff comes from the this mechanical change. I split it into a separate commit for easier review.

I tried to replicate the disk snapshots as closely as possible, by even including the source file path in them, though I think it is not very useful. There are some newline changes in a few tests, I didn't feel like it is worth fixing those.

CC @Zalathar

I suppose that we should do the same for citool, I can send that as a follow-up.

Fixes: #164837

rustbot · 2026-10-24T14:42:58Z

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

Owners of files modified in this PR: bootstrap
bootstrap expanded to 6 candidates
Random selection from Mark-Simulacrum, clubby789

Mark-Simulacrum · 2026-10-24T14:49:46Z

disadvantage that it requires installing a separate binary (cargo insta) for blessing inline snapshot tests

Should/did we ask upstream on whether that's something they'd like to change?

Kobzol · 2026-10-24T14:50:33Z

mitsuhiko/insta#490 it's a known issue, but it seems like there hasn't been activity on it.

Mark-Simulacrum · 2026-10-25T18:05:35Z

@bors r+ rollup

rust-bors · 2026-10-25T18:05:38Z

📌 Commit 3e342a2 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

🌲 The tree is currently closed for pull requests below priority 5. This pull request will be tested once the tree is reopened.

Reason for tree closure: test-aarch64-apple-macos-26-2 out of disk space

…uwer Rollup of 20 pull requests Successful merges: - #163730 (add tests over re-entrancy guarantees for 160776) - #164834 (miri subtree update) - #164849 (Use the span of the doctest code block fence for figuring out the line number) - #164883 (rustdoc: don't panic on a nested use group with no path prefix) - #164890 (Store cold blocks in a bitset instead of a Vec of bools) - #163458 (stabilize {Rc, Arc}::is_unique) - #163499 (vec: stabilise allocators for into_iter) - #163805 (std: check `SO_ERROR` after poll in `TcpStream::connect_timeout`) - #163816 (stabilize String::into_chars) - #163819 (Correct documentation of what `core::ops::Code` is.) - #163847 (add regression test for reborrow-invariant-type) - #164006 (Arduously fix typo) - #164009 (Update `Ready` future expect messages) - #164522 (Add IPv6 hop limit stubs to the motor OS net backend) - #164602 (Improve seek_read_buf_exact() test coverage to match seek_read_exact()) - #164772 (docs: Two nitpick changes to `HashMap`, `BTreeMap` Entry API docs) - #164794 (Expose FloatErrorKind) - #164802 (Migrate stable-specific run-make tests to UI tests) - #164899 (Only recover if we may in `parse_expr_tuple_parens`) - #164903 (rustc-dev-guide subtree update) Failed merges: - #164856 (Switch from `insta` to `expect-test` in bootstrap)

@Zalathar

Switch from `insta` to `expect-test` in bootstrap While I like `insta` a bit more for snapshot tests, it has a disadvantage that it requires installing a separate binary (`cargo insta`) for blessing *inline* snapshot tests. That is not very intuitive for people who need to bless inline bootstrap snapshots, and then realize that `x test bootstrap --bless` does nothing. This PR switches from `insta` to `expect-test`, which allows updating inline snapshots via an environment variable while running `cargo test`, without requiring a separate binary. `expect-test` is a `rust-lang` (well, `rust-analyzer`) [repository](https://github.com/rust-analyzer/expect-test), so we should be good there, and it even removes two `dev` dependencies from bootstrap. Changing the inline snapshots was a bit non-trivial to do with a regex (at least in my IDE) because we have to switch the argument order, which is not that simple across multiple lines. So I decided to try https://github.com/ast-grep/ast-grep. I used an LLM to propose the initial rewrite rule, and then modified it slightly and ran `ast-grep` to update the code. The applied rule was this: ```yaml id: insta-to-expect-test language: rust rule: pattern: insta::assert_snapshot!($$$ARGS) transform: LHS: replace: source: $$$ARGS replace: '(?s)^(?<lhs>.*?),\s*@(?<rhs>.*?)\s*,?\s*$' by: '${lhs}' RHS: replace: source: $$$ARGS replace: '(?s)^(?<lhs>.*?),\s*@(?<rhs>.*?)\s*,?\s*$' by: '${rhs}' fix: expect_test::expect![[$RHS]].assert_eq(&$LHS) ``` You can test it in the `ast-grep` [playground](https://ast-grep.github.io/playground.html#eyJtb2RlIjoiQ29uZmlnIiwibGFuZyI6InJ1c3QiLCJxdWVyeSI6IiIsInJld3JpdGUiOiJzb3VyY2U6ICQkJEFSR1NcbnJlcGxhY2U6ICcoP3MpXig/PGxocz4uKj8pLFxccypAKD88cmhzPi4qPylcXHMqLD9cXHMqJCdcbmJ5OiAnJHtyaHN9JyIsInN0cmljdG5lc3MiOiJzbWFydCIsInNlbGVjdG9yIjoiIiwiY29uZmlnIjoiaWQ6IGluc3RhLXRvLWV4cGVjdC10ZXN0XG5sYW5ndWFnZTogcnVzdFxucnVsZTpcbiAgcGF0dGVybjogaW5zdGE6OmFzc2VydF9zbmFwc2hvdCEoJCQkQVJHUylcbnRyYW5zZm9ybTpcbiAgTEhTOlxuICAgIHJlcGxhY2U6XG4gICAgICBzb3VyY2U6ICQkJEFSR1NcbiAgICAgIHJlcGxhY2U6ICcoP3MpXig/PGxocz4uKj8pLFxccypAKD88cmhzPi4qPylcXHMqLD9cXHMqJCdcbiAgICAgIGJ5OiAnJHtsaHN9J1xuICBSSFM6XG4gICAgcmVwbGFjZTpcbiAgICAgIHNvdXJjZTogJCQkQVJHU1xuICAgICAgcmVwbGFjZTogJyg/cyleKD88bGhzPi4qPyksXFxzKkAoPzxyaHM+Lio/KVxccyosP1xccyokJ1xuICAgICAgYnk6ICcke3Joc30nXG5maXg6IGV4cGVjdF90ZXN0OjpleHBlY3QhWyRSSFNdLmFzc2VydF9lcSgmJExIUykiLCJzb3VyY2UiOiJpbnN0YTo6YXNzZXJ0X3NuYXBzaG90IShcbiAgICAgICAgICAgIGN0eC5jb25maWcoXCJidWlsZFwiKVxuICAgICAgICAgICAgICAgIC5yZW5kZXJfc3RlcHMoKSwgQHJcIlxuICAgICAgICBbYnVpbGRdIGxsdm0gPGhvc3Q+XG4gICAgICAgIFtidWlsZF0gcnVzdGMgMCA8aG9zdD4gLT4gcnVzdGMgMSA8aG9zdD5cbiAgICAgICAgW2J1aWxkXSBydXN0YyAxIDxob3N0PiAtPiBzdGQgMSA8aG9zdD5cbiAgICAgICAgW2J1aWxkXSBydXN0ZG9jIDEgPGhvc3Q+XG4gICAgICAgIFwiLFxuICAgICAgICApOyJ9). I used double brackets because it formatted better (IMO) with `x fmt`. Most of the diff comes from the this mechanical change. I split it into a separate commit for easier review. I tried to replicate the disk snapshots as closely as possible, by even including the source file path in them, though I think it is not very useful. There are some newline changes in a few tests, I didn't feel like it is worth fixing those. CC @Zalathar I suppose that we should do the same for `citool`, I can send that as a follow-up. Fixes: rust-lang#164837

Zalathar · 2026-10-26T03:08:04Z

I tried to replicate the disk snapshots as closely as possible, by even including the source file path in them, though I think it is not very useful. There are some newline changes in a few tests, I didn't feel like it is worth fixing those.

For a migration, these both seem like reasonable choices. 👍

rustbot · 2026-10-26T06:45:24Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

Kobzol · 2026-10-26T06:46:35Z

Rebased.

@bors r=Mark-Simulacrum

rust-bors · 2026-10-26T06:46:38Z

📌 Commit 471a99e has been tentatively approved by Mark-Simulacrum

It will be put into the queue for this repository once PR CI succeeds.

@Zalathar

Switch from `insta` to `expect-test` in bootstrap While I like `insta` a bit more for snapshot tests, it has a disadvantage that it requires installing a separate binary (`cargo insta`) for blessing *inline* snapshot tests. That is not very intuitive for people who need to bless inline bootstrap snapshots, and then realize that `x test bootstrap --bless` does nothing. This PR switches from `insta` to `expect-test`, which allows updating inline snapshots via an environment variable while running `cargo test`, without requiring a separate binary. `expect-test` is a `rust-lang` (well, `rust-analyzer`) [repository](https://github.com/rust-analyzer/expect-test), so we should be good there, and it even removes two `dev` dependencies from bootstrap. Changing the inline snapshots was a bit non-trivial to do with a regex (at least in my IDE) because we have to switch the argument order, which is not that simple across multiple lines. So I decided to try https://github.com/ast-grep/ast-grep. I used an LLM to propose the initial rewrite rule, and then modified it slightly and ran `ast-grep` to update the code. The applied rule was this: ```yaml id: insta-to-expect-test language: rust rule: pattern: insta::assert_snapshot!($$$ARGS) transform: LHS: replace: source: $$$ARGS replace: '(?s)^(?<lhs>.*?),\s*@(?<rhs>.*?)\s*,?\s*$' by: '${lhs}' RHS: replace: source: $$$ARGS replace: '(?s)^(?<lhs>.*?),\s*@(?<rhs>.*?)\s*,?\s*$' by: '${rhs}' fix: expect_test::expect![[$RHS]].assert_eq(&$LHS) ``` You can test it in the `ast-grep` [playground](https://ast-grep.github.io/playground.html#eyJtb2RlIjoiQ29uZmlnIiwibGFuZyI6InJ1c3QiLCJxdWVyeSI6IiIsInJld3JpdGUiOiJzb3VyY2U6ICQkJEFSR1NcbnJlcGxhY2U6ICcoP3MpXig/PGxocz4uKj8pLFxccypAKD88cmhzPi4qPylcXHMqLD9cXHMqJCdcbmJ5OiAnJHtyaHN9JyIsInN0cmljdG5lc3MiOiJzbWFydCIsInNlbGVjdG9yIjoiIiwiY29uZmlnIjoiaWQ6IGluc3RhLXRvLWV4cGVjdC10ZXN0XG5sYW5ndWFnZTogcnVzdFxucnVsZTpcbiAgcGF0dGVybjogaW5zdGE6OmFzc2VydF9zbmFwc2hvdCEoJCQkQVJHUylcbnRyYW5zZm9ybTpcbiAgTEhTOlxuICAgIHJlcGxhY2U6XG4gICAgICBzb3VyY2U6ICQkJEFSR1NcbiAgICAgIHJlcGxhY2U6ICcoP3MpXig/PGxocz4uKj8pLFxccypAKD88cmhzPi4qPylcXHMqLD9cXHMqJCdcbiAgICAgIGJ5OiAnJHtsaHN9J1xuICBSSFM6XG4gICAgcmVwbGFjZTpcbiAgICAgIHNvdXJjZTogJCQkQVJHU1xuICAgICAgcmVwbGFjZTogJyg/cyleKD88bGhzPi4qPyksXFxzKkAoPzxyaHM+Lio/KVxccyosP1xccyokJ1xuICAgICAgYnk6ICcke3Joc30nXG5maXg6IGV4cGVjdF90ZXN0OjpleHBlY3QhWyRSSFNdLmFzc2VydF9lcSgmJExIUykiLCJzb3VyY2UiOiJpbnN0YTo6YXNzZXJ0X3NuYXBzaG90IShcbiAgICAgICAgICAgIGN0eC5jb25maWcoXCJidWlsZFwiKVxuICAgICAgICAgICAgICAgIC5yZW5kZXJfc3RlcHMoKSwgQHJcIlxuICAgICAgICBbYnVpbGRdIGxsdm0gPGhvc3Q+XG4gICAgICAgIFtidWlsZF0gcnVzdGMgMCA8aG9zdD4gLT4gcnVzdGMgMSA8aG9zdD5cbiAgICAgICAgW2J1aWxkXSBydXN0YyAxIDxob3N0PiAtPiBzdGQgMSA8aG9zdD5cbiAgICAgICAgW2J1aWxkXSBydXN0ZG9jIDEgPGhvc3Q+XG4gICAgICAgIFwiLFxuICAgICAgICApOyJ9). I used double brackets because it formatted better (IMO) with `x fmt`. Most of the diff comes from the this mechanical change. I split it into a separate commit for easier review. I tried to replicate the disk snapshots as closely as possible, by even including the source file path in them, though I think it is not very useful. There are some newline changes in a few tests, I didn't feel like it is worth fixing those. CC @Zalathar I suppose that we should do the same for `citool`, I can send that as a follow-up. Fixes: rust-lang#164837

…uwer Rollup of 8 pull requests Successful merges: - #164955 (Use the updated buffer length in UEFI locate_handles) - #164958 (uefi: roll back env changes when `start_image` fails) - #164968 (thread_local::guard: update comments a bit) - #164303 (Remove the 'sub' method from 'At' and migrate to 'sub_raw') - #164674 (Use a NoSpan marker for region constraints without spans) - #164856 (Switch from `insta` to `expect-test` in bootstrap) - #164934 (Remove redundant vec and duplicate indexing in find_noop_landing_pads) - #164954 (Reduce `SpanData` use)

JonathanBrouwer · 2026-10-26T11:04:42Z

💔 I suspect this PR failed tests as part of a rollup
@bors r-

After fixing the problem, consider running a try job for the failed job before re-approving.

Link to failure: #164974 (comment)

rust-bors · 2026-10-26T11:04:52Z

This pull request was unapproved.

This PR was contained in a rollup (#164974), which was unapproved.

View changes since this unapproval

Kobzol · 2026-10-26T11:16:49Z

@bors try jobs=test-x86_64-msvc-2

Switch from `insta` to `expect-test` in bootstrap try-job: test-x86_64-msvc-2

rust-bors · 2026-10-26T13:11:01Z

☀️ Try build successful (CI)
Build commit: 8fd9cd0 (8fd9cd08c5d30e6fe3cd394bb93f4e8f8d772db8)
Base parent: 019b59d (019b59d8101bb3e141f1b880684747b4217beeb6)

Kobzol · 2026-10-26T13:12:40Z

Ok, another try.

@bors r=Mark-Simulacrum

rust-bors · 2026-10-26T13:12:43Z

📌 Commit c96cf93 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@Zalathar

Switch from `insta` to `expect-test` in bootstrap While I like `insta` a bit more for snapshot tests, it has a disadvantage that it requires installing a separate binary (`cargo insta`) for blessing *inline* snapshot tests. That is not very intuitive for people who need to bless inline bootstrap snapshots, and then realize that `x test bootstrap --bless` does nothing. This PR switches from `insta` to `expect-test`, which allows updating inline snapshots via an environment variable while running `cargo test`, without requiring a separate binary. `expect-test` is a `rust-lang` (well, `rust-analyzer`) [repository](https://github.com/rust-analyzer/expect-test), so we should be good there, and it even removes two `dev` dependencies from bootstrap. Changing the inline snapshots was a bit non-trivial to do with a regex (at least in my IDE) because we have to switch the argument order, which is not that simple across multiple lines. So I decided to try https://github.com/ast-grep/ast-grep. I used an LLM to propose the initial rewrite rule, and then modified it slightly and ran `ast-grep` to update the code. The applied rule was this: ```yaml id: insta-to-expect-test language: rust rule: pattern: insta::assert_snapshot!($$$ARGS) transform: LHS: replace: source: $$$ARGS replace: '(?s)^(?<lhs>.*?),\s*@(?<rhs>.*?)\s*,?\s*$' by: '${lhs}' RHS: replace: source: $$$ARGS replace: '(?s)^(?<lhs>.*?),\s*@(?<rhs>.*?)\s*,?\s*$' by: '${rhs}' fix: expect_test::expect![[$RHS]].assert_eq(&$LHS) ``` You can test it in the `ast-grep` [playground](https://ast-grep.github.io/playground.html#eyJtb2RlIjoiQ29uZmlnIiwibGFuZyI6InJ1c3QiLCJxdWVyeSI6IiIsInJld3JpdGUiOiJzb3VyY2U6ICQkJEFSR1NcbnJlcGxhY2U6ICcoP3MpXig/PGxocz4uKj8pLFxccypAKD88cmhzPi4qPylcXHMqLD9cXHMqJCdcbmJ5OiAnJHtyaHN9JyIsInN0cmljdG5lc3MiOiJzbWFydCIsInNlbGVjdG9yIjoiIiwiY29uZmlnIjoiaWQ6IGluc3RhLXRvLWV4cGVjdC10ZXN0XG5sYW5ndWFnZTogcnVzdFxucnVsZTpcbiAgcGF0dGVybjogaW5zdGE6OmFzc2VydF9zbmFwc2hvdCEoJCQkQVJHUylcbnRyYW5zZm9ybTpcbiAgTEhTOlxuICAgIHJlcGxhY2U6XG4gICAgICBzb3VyY2U6ICQkJEFSR1NcbiAgICAgIHJlcGxhY2U6ICcoP3MpXig/PGxocz4uKj8pLFxccypAKD88cmhzPi4qPylcXHMqLD9cXHMqJCdcbiAgICAgIGJ5OiAnJHtsaHN9J1xuICBSSFM6XG4gICAgcmVwbGFjZTpcbiAgICAgIHNvdXJjZTogJCQkQVJHU1xuICAgICAgcmVwbGFjZTogJyg/cyleKD88bGhzPi4qPyksXFxzKkAoPzxyaHM+Lio/KVxccyosP1xccyokJ1xuICAgICAgYnk6ICcke3Joc30nXG5maXg6IGV4cGVjdF90ZXN0OjpleHBlY3QhWyRSSFNdLmFzc2VydF9lcSgmJExIUykiLCJzb3VyY2UiOiJpbnN0YTo6YXNzZXJ0X3NuYXBzaG90IShcbiAgICAgICAgICAgIGN0eC5jb25maWcoXCJidWlsZFwiKVxuICAgICAgICAgICAgICAgIC5yZW5kZXJfc3RlcHMoKSwgQHJcIlxuICAgICAgICBbYnVpbGRdIGxsdm0gPGhvc3Q+XG4gICAgICAgIFtidWlsZF0gcnVzdGMgMCA8aG9zdD4gLT4gcnVzdGMgMSA8aG9zdD5cbiAgICAgICAgW2J1aWxkXSBydXN0YyAxIDxob3N0PiAtPiBzdGQgMSA8aG9zdD5cbiAgICAgICAgW2J1aWxkXSBydXN0ZG9jIDEgPGhvc3Q+XG4gICAgICAgIFwiLFxuICAgICAgICApOyJ9). I used double brackets because it formatted better (IMO) with `x fmt`. Most of the diff comes from the this mechanical change. I split it into a separate commit for easier review. I tried to replicate the disk snapshots as closely as possible, by even including the source file path in them, though I think it is not very useful. There are some newline changes in a few tests, I didn't feel like it is worth fixing those. CC @Zalathar I suppose that we should do the same for `citool`, I can send that as a follow-up. Fixes: rust-lang#164837

@Zalathar

Switch from `insta` to `expect-test` in bootstrap While I like `insta` a bit more for snapshot tests, it has a disadvantage that it requires installing a separate binary (`cargo insta`) for blessing *inline* snapshot tests. That is not very intuitive for people who need to bless inline bootstrap snapshots, and then realize that `x test bootstrap --bless` does nothing. This PR switches from `insta` to `expect-test`, which allows updating inline snapshots via an environment variable while running `cargo test`, without requiring a separate binary. `expect-test` is a `rust-lang` (well, `rust-analyzer`) [repository](https://github.com/rust-analyzer/expect-test), so we should be good there, and it even removes two `dev` dependencies from bootstrap. Changing the inline snapshots was a bit non-trivial to do with a regex (at least in my IDE) because we have to switch the argument order, which is not that simple across multiple lines. So I decided to try https://github.com/ast-grep/ast-grep. I used an LLM to propose the initial rewrite rule, and then modified it slightly and ran `ast-grep` to update the code. The applied rule was this: ```yaml id: insta-to-expect-test language: rust rule: pattern: insta::assert_snapshot!($$$ARGS) transform: LHS: replace: source: $$$ARGS replace: '(?s)^(?<lhs>.*?),\s*@(?<rhs>.*?)\s*,?\s*$' by: '${lhs}' RHS: replace: source: $$$ARGS replace: '(?s)^(?<lhs>.*?),\s*@(?<rhs>.*?)\s*,?\s*$' by: '${rhs}' fix: expect_test::expect![[$RHS]].assert_eq(&$LHS) ``` You can test it in the `ast-grep` [playground](https://ast-grep.github.io/playground.html#eyJtb2RlIjoiQ29uZmlnIiwibGFuZyI6InJ1c3QiLCJxdWVyeSI6IiIsInJld3JpdGUiOiJzb3VyY2U6ICQkJEFSR1NcbnJlcGxhY2U6ICcoP3MpXig/PGxocz4uKj8pLFxccypAKD88cmhzPi4qPylcXHMqLD9cXHMqJCdcbmJ5OiAnJHtyaHN9JyIsInN0cmljdG5lc3MiOiJzbWFydCIsInNlbGVjdG9yIjoiIiwiY29uZmlnIjoiaWQ6IGluc3RhLXRvLWV4cGVjdC10ZXN0XG5sYW5ndWFnZTogcnVzdFxucnVsZTpcbiAgcGF0dGVybjogaW5zdGE6OmFzc2VydF9zbmFwc2hvdCEoJCQkQVJHUylcbnRyYW5zZm9ybTpcbiAgTEhTOlxuICAgIHJlcGxhY2U6XG4gICAgICBzb3VyY2U6ICQkJEFSR1NcbiAgICAgIHJlcGxhY2U6ICcoP3MpXig/PGxocz4uKj8pLFxccypAKD88cmhzPi4qPylcXHMqLD9cXHMqJCdcbiAgICAgIGJ5OiAnJHtsaHN9J1xuICBSSFM6XG4gICAgcmVwbGFjZTpcbiAgICAgIHNvdXJjZTogJCQkQVJHU1xuICAgICAgcmVwbGFjZTogJyg/cyleKD88bGhzPi4qPyksXFxzKkAoPzxyaHM+Lio/KVxccyosP1xccyokJ1xuICAgICAgYnk6ICcke3Joc30nXG5maXg6IGV4cGVjdF90ZXN0OjpleHBlY3QhWyRSSFNdLmFzc2VydF9lcSgmJExIUykiLCJzb3VyY2UiOiJpbnN0YTo6YXNzZXJ0X3NuYXBzaG90IShcbiAgICAgICAgICAgIGN0eC5jb25maWcoXCJidWlsZFwiKVxuICAgICAgICAgICAgICAgIC5yZW5kZXJfc3RlcHMoKSwgQHJcIlxuICAgICAgICBbYnVpbGRdIGxsdm0gPGhvc3Q+XG4gICAgICAgIFtidWlsZF0gcnVzdGMgMCA8aG9zdD4gLT4gcnVzdGMgMSA8aG9zdD5cbiAgICAgICAgW2J1aWxkXSBydXN0YyAxIDxob3N0PiAtPiBzdGQgMSA8aG9zdD5cbiAgICAgICAgW2J1aWxkXSBydXN0ZG9jIDEgPGhvc3Q+XG4gICAgICAgIFwiLFxuICAgICAgICApOyJ9). I used double brackets because it formatted better (IMO) with `x fmt`. Most of the diff comes from the this mechanical change. I split it into a separate commit for easier review. I tried to replicate the disk snapshots as closely as possible, by even including the source file path in them, though I think it is not very useful. There are some newline changes in a few tests, I didn't feel like it is worth fixing those. CC @Zalathar I suppose that we should do the same for `citool`, I can send that as a follow-up. Fixes: rust-lang#164837

…uwer Rollup of 12 pull requests Successful merges: - #162808 (Enable `--generate-link-to-definition` rustdoc option on std docs) - #163219 (assumptions_on_binders: Test mixed ambiguous ORs) - #164985 (Only recover if we may for `recover_missing_dot`) - #161521 (Replace check_attr_crate_level with check_target for #[doc]) - #162530 (Move #[naked] attribute check to attribute parsing stage) - #164103 (trait solver: Resolve region vars before eager placeholder handling) - #164692 (move `ppcf128` lang item to `core::num::imp`) - #164702 (Point at `impl` through which associated function is provided) - #164776 (Account for trait object with implicit `'static` lifetime in field type being returned) - #164791 (Self param after const param) - #164856 (Switch from `insta` to `expect-test` in bootstrap) - #164888 (Add regression tests for #156380)

…uwer Rollup of 14 pull requests Successful merges: - #163219 (assumptions_on_binders: Test mixed ambiguous ORs) - #164985 (Only recover if we may for `recover_missing_dot`) - #161521 (Replace check_attr_crate_level with check_target for #[doc]) - #162530 (Move #[naked] attribute check to attribute parsing stage) - #164103 (trait solver: Resolve region vars before eager placeholder handling) - #164692 (move `ppcf128` lang item to `core::num::imp`) - #164702 (Point at `impl` through which associated function is provided) - #164741 (Use explicit target cpu in tests parsing generated asm) - #164767 (Add regression tests for transmutability issues) - #164776 (Account for trait object with implicit `'static` lifetime in field type being returned) - #164791 (Self param after const param) - #164856 (Switch from `insta` to `expect-test` in bootstrap) - #164888 (Add regression tests for #156380) - #164967 (Add codegen test for power of two implying nonzero with debuginfo)

…uwer Rollup of 20 pull requests Successful merges: - rust-lang/rust#163730 (add tests over re-entrancy guarantees for 160776) - rust-lang/rust#164834 (miri subtree update) - rust-lang/rust#164849 (Use the span of the doctest code block fence for figuring out the line number) - rust-lang/rust#164883 (rustdoc: don't panic on a nested use group with no path prefix) - rust-lang/rust#164890 (Store cold blocks in a bitset instead of a Vec of bools) - rust-lang/rust#163458 (stabilize {Rc, Arc}::is_unique) - rust-lang/rust#163499 (vec: stabilise allocators for into_iter) - rust-lang/rust#163805 (std: check `SO_ERROR` after poll in `TcpStream::connect_timeout`) - rust-lang/rust#163816 (stabilize String::into_chars) - rust-lang/rust#163819 (Correct documentation of what `core::ops::Code` is.) - rust-lang/rust#163847 (add regression test for reborrow-invariant-type) - rust-lang/rust#164006 (Arduously fix typo) - rust-lang/rust#164009 (Update `Ready` future expect messages) - rust-lang/rust#164522 (Add IPv6 hop limit stubs to the motor OS net backend) - rust-lang/rust#164602 (Improve seek_read_buf_exact() test coverage to match seek_read_exact()) - rust-lang/rust#164772 (docs: Two nitpick changes to `HashMap`, `BTreeMap` Entry API docs) - rust-lang/rust#164794 (Expose FloatErrorKind) - rust-lang/rust#164802 (Migrate stable-specific run-make tests to UI tests) - rust-lang/rust#164899 (Only recover if we may in `parse_expr_tuple_parens`) - rust-lang/rust#164903 (rustc-dev-guide subtree update) Failed merges: - rust-lang/rust#164856 (Switch from `insta` to `expect-test` in bootstrap)

@Zalathar

Rollup merge of #164856 - Kobzol:expect-test, r=Mark-Simulacrum Switch from `insta` to `expect-test` in bootstrap While I like `insta` a bit more for snapshot tests, it has a disadvantage that it requires installing a separate binary (`cargo insta`) for blessing *inline* snapshot tests. That is not very intuitive for people who need to bless inline bootstrap snapshots, and then realize that `x test bootstrap --bless` does nothing. This PR switches from `insta` to `expect-test`, which allows updating inline snapshots via an environment variable while running `cargo test`, without requiring a separate binary. `expect-test` is a `rust-lang` (well, `rust-analyzer`) [repository](https://github.com/rust-analyzer/expect-test), so we should be good there, and it even removes two `dev` dependencies from bootstrap. Changing the inline snapshots was a bit non-trivial to do with a regex (at least in my IDE) because we have to switch the argument order, which is not that simple across multiple lines. So I decided to try https://github.com/ast-grep/ast-grep. I used an LLM to propose the initial rewrite rule, and then modified it slightly and ran `ast-grep` to update the code. The applied rule was this: ```yaml id: insta-to-expect-test language: rust rule: pattern: insta::assert_snapshot!($$$ARGS) transform: LHS: replace: source: $$$ARGS replace: '(?s)^(?<lhs>.*?),\s*@(?<rhs>.*?)\s*,?\s*$' by: '${lhs}' RHS: replace: source: $$$ARGS replace: '(?s)^(?<lhs>.*?),\s*@(?<rhs>.*?)\s*,?\s*$' by: '${rhs}' fix: expect_test::expect![[$RHS]].assert_eq(&$LHS) ``` You can test it in the `ast-grep` [playground](https://ast-grep.github.io/playground.html#eyJtb2RlIjoiQ29uZmlnIiwibGFuZyI6InJ1c3QiLCJxdWVyeSI6IiIsInJld3JpdGUiOiJzb3VyY2U6ICQkJEFSR1NcbnJlcGxhY2U6ICcoP3MpXig/PGxocz4uKj8pLFxccypAKD88cmhzPi4qPylcXHMqLD9cXHMqJCdcbmJ5OiAnJHtyaHN9JyIsInN0cmljdG5lc3MiOiJzbWFydCIsInNlbGVjdG9yIjoiIiwiY29uZmlnIjoiaWQ6IGluc3RhLXRvLWV4cGVjdC10ZXN0XG5sYW5ndWFnZTogcnVzdFxucnVsZTpcbiAgcGF0dGVybjogaW5zdGE6OmFzc2VydF9zbmFwc2hvdCEoJCQkQVJHUylcbnRyYW5zZm9ybTpcbiAgTEhTOlxuICAgIHJlcGxhY2U6XG4gICAgICBzb3VyY2U6ICQkJEFSR1NcbiAgICAgIHJlcGxhY2U6ICcoP3MpXig/PGxocz4uKj8pLFxccypAKD88cmhzPi4qPylcXHMqLD9cXHMqJCdcbiAgICAgIGJ5OiAnJHtsaHN9J1xuICBSSFM6XG4gICAgcmVwbGFjZTpcbiAgICAgIHNvdXJjZTogJCQkQVJHU1xuICAgICAgcmVwbGFjZTogJyg/cyleKD88bGhzPi4qPyksXFxzKkAoPzxyaHM+Lio/KVxccyosP1xccyokJ1xuICAgICAgYnk6ICcke3Joc30nXG5maXg6IGV4cGVjdF90ZXN0OjpleHBlY3QhWyRSSFNdLmFzc2VydF9lcSgmJExIUykiLCJzb3VyY2UiOiJpbnN0YTo6YXNzZXJ0X3NuYXBzaG90IShcbiAgICAgICAgICAgIGN0eC5jb25maWcoXCJidWlsZFwiKVxuICAgICAgICAgICAgICAgIC5yZW5kZXJfc3RlcHMoKSwgQHJcIlxuICAgICAgICBbYnVpbGRdIGxsdm0gPGhvc3Q+XG4gICAgICAgIFtidWlsZF0gcnVzdGMgMCA8aG9zdD4gLT4gcnVzdGMgMSA8aG9zdD5cbiAgICAgICAgW2J1aWxkXSBydXN0YyAxIDxob3N0PiAtPiBzdGQgMSA8aG9zdD5cbiAgICAgICAgW2J1aWxkXSBydXN0ZG9jIDEgPGhvc3Q+XG4gICAgICAgIFwiLFxuICAgICAgICApOyJ9). I used double brackets because it formatted better (IMO) with `x fmt`. Most of the diff comes from the this mechanical change. I split it into a separate commit for easier review. I tried to replicate the disk snapshots as closely as possible, by even including the source file path in them, though I think it is not very useful. There are some newline changes in a few tests, I didn't feel like it is worth fixing those. CC @Zalathar I suppose that we should do the same for `citool`, I can send that as a follow-up. Fixes: #164837

…uwer Rollup of 14 pull requests Successful merges: - rust-lang/rust#163219 (assumptions_on_binders: Test mixed ambiguous ORs) - rust-lang/rust#164985 (Only recover if we may for `recover_missing_dot`) - rust-lang/rust#161521 (Replace check_attr_crate_level with check_target for #[doc]) - rust-lang/rust#162530 (Move #[naked] attribute check to attribute parsing stage) - rust-lang/rust#164103 (trait solver: Resolve region vars before eager placeholder handling) - rust-lang/rust#164692 (move `ppcf128` lang item to `core::num::imp`) - rust-lang/rust#164702 (Point at `impl` through which associated function is provided) - rust-lang/rust#164741 (Use explicit target cpu in tests parsing generated asm) - rust-lang/rust#164767 (Add regression tests for transmutability issues) - rust-lang/rust#164776 (Account for trait object with implicit `'static` lifetime in field type being returned) - rust-lang/rust#164791 (Self param after const param) - rust-lang/rust#164856 (Switch from `insta` to `expect-test` in bootstrap) - rust-lang/rust#164888 (Add regression tests for #156380) - rust-lang/rust#164967 (Add codegen test for power of two implying nonzero with debuginfo)

rustbot assigned Mark-Simulacrum Oct 24, 2026

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Oct 24, 2026

Kobzol mentioned this pull request Oct 24, 2026

./x test --bless src/bootstrap does not work as expected #164837

Closed

This comment has been minimized.

Sign in to view

Kobzol force-pushed the expect-test branch from 086363f to 3e342a2 Compare October 24, 2026 14:49

rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 25, 2026

This was referenced Oct 25, 2026

Rollup of 19 pull requests #164922

Closed

Rollup of 19 pull requests #164923

Closed

Rollup of 20 pull requests #164928

Merged

JonathanBrouwer mentioned this pull request Oct 26, 2026

Rollup of 7 pull requests #164939

Closed

rust-bors Bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 26, 2026

This comment has been minimized.

Sign in to view

Replace insta with expect-test in bootstrap

6c8618c

Kobzol force-pushed the expect-test branch from 3e342a2 to 471a99e Compare October 26, 2026 06:45

rust-bors Bot added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 26, 2026

rust-bors Bot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 26, 2026

JonathanBrouwer mentioned this pull request Oct 26, 2026

Rollup of 8 pull requests #164974

Closed

rust-bors Bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 26, 2026

Normalize Windows path separators in bootstrap snapshots

c96cf93

rust-bors Bot pushed a commit that referenced this pull request Oct 26, 2026

Auto merge of #164856 - Kobzol:expect-test, r=<try>

8fd9cd0

Switch from `insta` to `expect-test` in bootstrap try-job: test-x86_64-msvc-2

This comment has been minimized.

Sign in to view

rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 26, 2026

JonathanBrouwer mentioned this pull request Oct 26, 2026

Rollup of 9 pull requests #164991

Closed

JonathanBrouwer mentioned this pull request Oct 26, 2026

Rollup of 12 pull requests #165000

Closed

JonathanBrouwer mentioned this pull request Oct 26, 2026

Rollup of 14 pull requests #165002

Merged

rust-bors Bot merged commit 5c1949b into rust-lang:main Oct 26, 2026
15 checks passed

rustbot added this to the 1.101.0 milestone Oct 26, 2026

Kobzol deleted the expect-test branch October 26, 2026 23:03

Conversation

Kobzol commented Oct 24, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Oct 24, 2026

Uh oh!

This comment has been minimized.

Mark-Simulacrum commented Oct 24, 2026

Uh oh!

Kobzol commented Oct 24, 2026

Uh oh!

Mark-Simulacrum commented Oct 25, 2026

Uh oh!

rust-bors Bot commented Oct 25, 2026

Uh oh!

This comment has been minimized.

Zalathar commented Oct 26, 2026

Uh oh!

rustbot commented Oct 26, 2026

Uh oh!

Kobzol commented Oct 26, 2026

Uh oh!

rust-bors Bot commented Oct 26, 2026

Uh oh!

JonathanBrouwer commented Oct 26, 2026

Uh oh!

rust-bors Bot commented Oct 26, 2026

Uh oh!

Kobzol commented Oct 26, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Oct 26, 2026

Uh oh!

Kobzol commented Oct 26, 2026

Uh oh!

rust-bors Bot commented Oct 26, 2026

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Kobzol commented Oct 24, 2026 •

edited by rustbot

Loading