Rollup of 10 pull requests - #159604

Closed
JonathanBrouwer wants to merge 113 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-Sb6P4rP
Closed

Rollup of 10 pull requests#159604
JonathanBrouwer wants to merge 113 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-Sb6P4rP

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

Create a similar rollup

ChayimFriedman2and others added 30 commits May 29, 2026 01:16
…onstant-sized
We used to set a `slice: None`.
The InvocationStrategy::Once path indexed world.flycheck[0] directly. The always!() above only logs in release builds, so when the list was empty it fell through and panicked with index out of bounds. Use first() and skip the restart when there is no handle.
Fixesrust-lang/rust-analyzer#21638
Previously we would still try to rename the incr comp session dir after
deleting it.
In both cases the incr comp session dir should no longer be accessed.
They should skip non-module scope (although I think they cannot skip and will do just fine), but must also process block module scopes.
internal: update links to `rustc_hir_analysis`
fix: Resolve non-plain paths in blocks correctly
…tpluxqp
feat: Treat library files as truly client immutable
…ztynowk
internal: Split out a session construct
feat: early late classification of lifetimes
…chenkov
Improve `AttrItem::span`
It has some shortcomings. Details in individual commits.
r? @petrochenkov
…, r=lcnr
Do not mark unnormalized const aliases as rigid when normalizing param env
Fixesrust-lang/trait-system-refactor-initiative#279
The old solver actually evaluates const aliases before normalizing param env.
The next solver should be consistent with that.
r? lcnr
also cc @BoxyUwU
…s-test, r=nnethercote
Add regression test for nested replacement ranges in `collect_tokens`
rust-lang#129346 removed support for nested replacement ranges in `collect_tokens`, and simplified the nesting out of `tests/ui/proc-macro/macro-rules-derive-cfg.rs` accordingly. That removal turned out to break real-world code, so it was reverted in rust-lang#132587 — but the revert only restored the compiler code, not the original nested shape of the test, leaving the nested case uncovered ever since.
This reinstates the nested case as a separate test: the pre-rust-lang/rust#129346 shape of `macro-rules-derive-cfg.rs` (a `cfg_attr` expansion nested inside a `let` statement, nested inside an anonymous constant), combined with the extra inner attributes that rust-lang#129346 added to the simplified version. If nested replacement range support regresses again, this test fails.
The expected stdout was verified against current nightly; the sibling test's checked-in stdout reproduces byte-for-byte under the same setup.
Closesrust-lang#132727
…ovements, r=Kobzol
Minor `TokenStream` improvements
I found these while attempting to improve the `TokenStream` representation in rust-lang#159048.
r? @Kobzol
…li-obk
Separate `InterpCx` usage by `ConstAnalysis` phases
`ConstAnalysis` has a `RefCell<InterpCx>`. During the analysis phase the accesses are read-only, but the visiting phase (performed by `Collector`) requires mutation, because of calls to `try_make_constant`.
This commit removes the `RefCell` by having two `InterpCx` instances: a read-only one for the `ConstAnalysis` and a mutable one for the visiting phase, stored in `Collector`. This removes the need for the `OperandCollector::ecx` field, and for many `borrow`/`borrow_mut` calls.
r? @cjgillot
…=Kobzol
Clarify `push_stream`/`push_tree`
More `TokenStream` cleanups. Details in individual commits.
r? @Kobzol
@rust-borsrust-borsBot added the rollup A PR which is a rollup label Jul 20, 2026
@rustbotrustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Jul 20, 2026
@JonathanBrouwer

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1,i686-msvc-*

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

📌 Commit a429491 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Jul 20, 2026
@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
Rollup of 10 pull requests
try-job: dist-various-1
try-job: test-various
try-job: x86_64-gnu-aux
try-job: x86_64-gnu-llvm-21-3
try-job: x86_64-msvc-1
try-job: aarch64-apple
try-job: x86_64-mingw-1
try-job: i686-msvc-*
@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
…uwer
Rollup of 10 pull requests
Successful merges:
- #159600 (`rust-analyzer` subtree update)
- #158046 (proc_macro: preserve file module spans for inner attrs)
- #159000 (Small cleanups to the incr comp session code)
- #159449 (Enable single Location to issue multiple borrows)
- #159587 (Improve `AttrItem::span`)
- #159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- #159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- #159585 (Minor `TokenStream` improvements)
- #159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- #159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- #159590 (Remove some dead code)
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job aarch64-apple-macos-26 failed! Check out the build log: (web)(plain enhanced)(plain)

Click to see the possible cause of the failure (guessed by this bot)

Important

For more information how to resolve CI failures of this job, visit this link.

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

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

💔 Test for 9169afd failed: CI. Failed job:

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 62f6391 (62f6391c197cdbdc35751e032ab889628d8e0e0a)
Base parent: 14ead7d (14ead7d3d509f50efe9afb84673e65885dfd4d07)

@rust-borsrust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 20, 2026
@rustbotrustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 20, 2026
@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved due to being closed.

@JonathanBrouwer
JonathanBrouwer deleted the rollup-Sb6P4rP branch August 21, 2026 08:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributesArea: Attributes (`#[…]`, `#![…]`)rollupA PR which is a rollupS-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rust-analyzerRelevant to the rust-analyzer team, which will review and decide on the PR/issue.WG-trait-system-refactorThe Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

20 participants

@JonathanBrouwer@rust-log-analyzer@rustbot@ChayimFriedman2@UnknownHacker1@bjorn3@ShoyuVanilla@ada4a@Veykril@dfireBird@bit-aloo@Wilfred@cuishuang@A4-Tacks@mingley@RealRTTV@Yashb404@ribru17@adwinwhite@Dnreikronos
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Rollup of 10 pull requests - #159604

Closed
JonathanBrouwer wants to merge 113 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-Sb6P4rP
Closed

Rollup of 10 pull requests#159604
JonathanBrouwer wants to merge 113 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-Sb6P4rP

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

Create a similar rollup

ChayimFriedman2and others added 30 commits May 29, 2026 01:16
…onstant-sized
We used to set a `slice: None`.
The InvocationStrategy::Once path indexed world.flycheck[0] directly. The always!() above only logs in release builds, so when the list was empty it fell through and panicked with index out of bounds. Use first() and skip the restart when there is no handle.
Fixesrust-lang/rust-analyzer#21638
Previously we would still try to rename the incr comp session dir after
deleting it.
In both cases the incr comp session dir should no longer be accessed.
They should skip non-module scope (although I think they cannot skip and will do just fine), but must also process block module scopes.
internal: update links to `rustc_hir_analysis`
fix: Resolve non-plain paths in blocks correctly
…tpluxqp
feat: Treat library files as truly client immutable
…ztynowk
internal: Split out a session construct
feat: early late classification of lifetimes
…chenkov
Improve `AttrItem::span`
It has some shortcomings. Details in individual commits.
r? @petrochenkov
…, r=lcnr
Do not mark unnormalized const aliases as rigid when normalizing param env
Fixesrust-lang/trait-system-refactor-initiative#279
The old solver actually evaluates const aliases before normalizing param env.
The next solver should be consistent with that.
r? lcnr
also cc @BoxyUwU
…s-test, r=nnethercote
Add regression test for nested replacement ranges in `collect_tokens`
rust-lang#129346 removed support for nested replacement ranges in `collect_tokens`, and simplified the nesting out of `tests/ui/proc-macro/macro-rules-derive-cfg.rs` accordingly. That removal turned out to break real-world code, so it was reverted in rust-lang#132587 — but the revert only restored the compiler code, not the original nested shape of the test, leaving the nested case uncovered ever since.
This reinstates the nested case as a separate test: the pre-rust-lang/rust#129346 shape of `macro-rules-derive-cfg.rs` (a `cfg_attr` expansion nested inside a `let` statement, nested inside an anonymous constant), combined with the extra inner attributes that rust-lang#129346 added to the simplified version. If nested replacement range support regresses again, this test fails.
The expected stdout was verified against current nightly; the sibling test's checked-in stdout reproduces byte-for-byte under the same setup.
Closesrust-lang#132727
…ovements, r=Kobzol
Minor `TokenStream` improvements
I found these while attempting to improve the `TokenStream` representation in rust-lang#159048.
r? @Kobzol
…li-obk
Separate `InterpCx` usage by `ConstAnalysis` phases
`ConstAnalysis` has a `RefCell<InterpCx>`. During the analysis phase the accesses are read-only, but the visiting phase (performed by `Collector`) requires mutation, because of calls to `try_make_constant`.
This commit removes the `RefCell` by having two `InterpCx` instances: a read-only one for the `ConstAnalysis` and a mutable one for the visiting phase, stored in `Collector`. This removes the need for the `OperandCollector::ecx` field, and for many `borrow`/`borrow_mut` calls.
r? @cjgillot
…=Kobzol
Clarify `push_stream`/`push_tree`
More `TokenStream` cleanups. Details in individual commits.
r? @Kobzol
@rust-borsrust-borsBot added the rollup A PR which is a rollup label Jul 20, 2026
@rustbotrustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Jul 20, 2026
@JonathanBrouwer

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1,i686-msvc-*

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

📌 Commit a429491 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Jul 20, 2026
@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
Rollup of 10 pull requests
try-job: dist-various-1
try-job: test-various
try-job: x86_64-gnu-aux
try-job: x86_64-gnu-llvm-21-3
try-job: x86_64-msvc-1
try-job: aarch64-apple
try-job: x86_64-mingw-1
try-job: i686-msvc-*
@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
…uwer
Rollup of 10 pull requests
Successful merges:
- #159600 (`rust-analyzer` subtree update)
- #158046 (proc_macro: preserve file module spans for inner attrs)
- #159000 (Small cleanups to the incr comp session code)
- #159449 (Enable single Location to issue multiple borrows)
- #159587 (Improve `AttrItem::span`)
- #159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- #159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- #159585 (Minor `TokenStream` improvements)
- #159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- #159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- #159590 (Remove some dead code)
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job aarch64-apple-macos-26 failed! Check out the build log: (web)(plain enhanced)(plain)

Click to see the possible cause of the failure (guessed by this bot)

Important

For more information how to resolve CI failures of this job, visit this link.

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

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

💔 Test for 9169afd failed: CI. Failed job:

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 62f6391 (62f6391c197cdbdc35751e032ab889628d8e0e0a)
Base parent: 14ead7d (14ead7d3d509f50efe9afb84673e65885dfd4d07)

@rust-borsrust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 20, 2026
@rustbotrustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 20, 2026
@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved due to being closed.

@JonathanBrouwer
JonathanBrouwer deleted the rollup-Sb6P4rP branch August 21, 2026 08:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributesArea: Attributes (`#[…]`, `#![…]`)rollupA PR which is a rollupS-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rust-analyzerRelevant to the rust-analyzer team, which will review and decide on the PR/issue.WG-trait-system-refactorThe Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

20 participants

@JonathanBrouwer@rust-log-analyzer@rustbot@ChayimFriedman2@UnknownHacker1@bjorn3@ShoyuVanilla@ada4a@Veykril@dfireBird@bit-aloo@Wilfred@cuishuang@A4-Tacks@mingley@RealRTTV@Yashb404@ribru17@adwinwhite@Dnreikronos
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Rollup of 10 pull requests - #159604

Closed
JonathanBrouwer wants to merge 113 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-Sb6P4rP
Closed

Rollup of 10 pull requests#159604
JonathanBrouwer wants to merge 113 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-Sb6P4rP

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

Create a similar rollup

ChayimFriedman2and others added 30 commits May 29, 2026 01:16
…onstant-sized
We used to set a `slice: None`.
The InvocationStrategy::Once path indexed world.flycheck[0] directly. The always!() above only logs in release builds, so when the list was empty it fell through and panicked with index out of bounds. Use first() and skip the restart when there is no handle.
Fixesrust-lang/rust-analyzer#21638
Previously we would still try to rename the incr comp session dir after
deleting it.
In both cases the incr comp session dir should no longer be accessed.
They should skip non-module scope (although I think they cannot skip and will do just fine), but must also process block module scopes.
internal: update links to `rustc_hir_analysis`
fix: Resolve non-plain paths in blocks correctly
…tpluxqp
feat: Treat library files as truly client immutable
…ztynowk
internal: Split out a session construct
feat: early late classification of lifetimes
…chenkov
Improve `AttrItem::span`
It has some shortcomings. Details in individual commits.
r? @petrochenkov
…, r=lcnr
Do not mark unnormalized const aliases as rigid when normalizing param env
Fixesrust-lang/trait-system-refactor-initiative#279
The old solver actually evaluates const aliases before normalizing param env.
The next solver should be consistent with that.
r? lcnr
also cc @BoxyUwU
…s-test, r=nnethercote
Add regression test for nested replacement ranges in `collect_tokens`
rust-lang#129346 removed support for nested replacement ranges in `collect_tokens`, and simplified the nesting out of `tests/ui/proc-macro/macro-rules-derive-cfg.rs` accordingly. That removal turned out to break real-world code, so it was reverted in rust-lang#132587 — but the revert only restored the compiler code, not the original nested shape of the test, leaving the nested case uncovered ever since.
This reinstates the nested case as a separate test: the pre-rust-lang/rust#129346 shape of `macro-rules-derive-cfg.rs` (a `cfg_attr` expansion nested inside a `let` statement, nested inside an anonymous constant), combined with the extra inner attributes that rust-lang#129346 added to the simplified version. If nested replacement range support regresses again, this test fails.
The expected stdout was verified against current nightly; the sibling test's checked-in stdout reproduces byte-for-byte under the same setup.
Closesrust-lang#132727
…ovements, r=Kobzol
Minor `TokenStream` improvements
I found these while attempting to improve the `TokenStream` representation in rust-lang#159048.
r? @Kobzol
…li-obk
Separate `InterpCx` usage by `ConstAnalysis` phases
`ConstAnalysis` has a `RefCell<InterpCx>`. During the analysis phase the accesses are read-only, but the visiting phase (performed by `Collector`) requires mutation, because of calls to `try_make_constant`.
This commit removes the `RefCell` by having two `InterpCx` instances: a read-only one for the `ConstAnalysis` and a mutable one for the visiting phase, stored in `Collector`. This removes the need for the `OperandCollector::ecx` field, and for many `borrow`/`borrow_mut` calls.
r? @cjgillot
…=Kobzol
Clarify `push_stream`/`push_tree`
More `TokenStream` cleanups. Details in individual commits.
r? @Kobzol
@rust-borsrust-borsBot added the rollup A PR which is a rollup label Jul 20, 2026
@rustbotrustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Jul 20, 2026
@JonathanBrouwer

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1,i686-msvc-*

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

📌 Commit a429491 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Jul 20, 2026
@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
Rollup of 10 pull requests
try-job: dist-various-1
try-job: test-various
try-job: x86_64-gnu-aux
try-job: x86_64-gnu-llvm-21-3
try-job: x86_64-msvc-1
try-job: aarch64-apple
try-job: x86_64-mingw-1
try-job: i686-msvc-*
@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
…uwer
Rollup of 10 pull requests
Successful merges:
- #159600 (`rust-analyzer` subtree update)
- #158046 (proc_macro: preserve file module spans for inner attrs)
- #159000 (Small cleanups to the incr comp session code)
- #159449 (Enable single Location to issue multiple borrows)
- #159587 (Improve `AttrItem::span`)
- #159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- #159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- #159585 (Minor `TokenStream` improvements)
- #159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- #159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- #159590 (Remove some dead code)
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job aarch64-apple-macos-26 failed! Check out the build log: (web)(plain enhanced)(plain)

Click to see the possible cause of the failure (guessed by this bot)

Important

For more information how to resolve CI failures of this job, visit this link.

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

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

💔 Test for 9169afd failed: CI. Failed job:

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 62f6391 (62f6391c197cdbdc35751e032ab889628d8e0e0a)
Base parent: 14ead7d (14ead7d3d509f50efe9afb84673e65885dfd4d07)

@rust-borsrust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 20, 2026
@rustbotrustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 20, 2026
@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved due to being closed.

@JonathanBrouwer
JonathanBrouwer deleted the rollup-Sb6P4rP branch August 21, 2026 08:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributesArea: Attributes (`#[…]`, `#![…]`)rollupA PR which is a rollupS-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rust-analyzerRelevant to the rust-analyzer team, which will review and decide on the PR/issue.WG-trait-system-refactorThe Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

20 participants

@JonathanBrouwer@rust-log-analyzer@rustbot@ChayimFriedman2@UnknownHacker1@bjorn3@ShoyuVanilla@ada4a@Veykril@dfireBird@bit-aloo@Wilfred@cuishuang@A4-Tacks@mingley@RealRTTV@Yashb404@ribru17@adwinwhite@Dnreikronos
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Rollup of 10 pull requests - #159604

Closed
JonathanBrouwer wants to merge 113 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-Sb6P4rP
Closed

Rollup of 10 pull requests#159604
JonathanBrouwer wants to merge 113 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-Sb6P4rP

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

Create a similar rollup

ChayimFriedman2and others added 30 commits May 29, 2026 01:16
…onstant-sized
We used to set a `slice: None`.
The InvocationStrategy::Once path indexed world.flycheck[0] directly. The always!() above only logs in release builds, so when the list was empty it fell through and panicked with index out of bounds. Use first() and skip the restart when there is no handle.
Fixesrust-lang/rust-analyzer#21638
Previously we would still try to rename the incr comp session dir after
deleting it.
In both cases the incr comp session dir should no longer be accessed.
They should skip non-module scope (although I think they cannot skip and will do just fine), but must also process block module scopes.
internal: update links to `rustc_hir_analysis`
fix: Resolve non-plain paths in blocks correctly
…tpluxqp
feat: Treat library files as truly client immutable
…ztynowk
internal: Split out a session construct
feat: early late classification of lifetimes
…chenkov
Improve `AttrItem::span`
It has some shortcomings. Details in individual commits.
r? @petrochenkov
…, r=lcnr
Do not mark unnormalized const aliases as rigid when normalizing param env
Fixesrust-lang/trait-system-refactor-initiative#279
The old solver actually evaluates const aliases before normalizing param env.
The next solver should be consistent with that.
r? lcnr
also cc @BoxyUwU
…s-test, r=nnethercote
Add regression test for nested replacement ranges in `collect_tokens`
rust-lang#129346 removed support for nested replacement ranges in `collect_tokens`, and simplified the nesting out of `tests/ui/proc-macro/macro-rules-derive-cfg.rs` accordingly. That removal turned out to break real-world code, so it was reverted in rust-lang#132587 — but the revert only restored the compiler code, not the original nested shape of the test, leaving the nested case uncovered ever since.
This reinstates the nested case as a separate test: the pre-rust-lang/rust#129346 shape of `macro-rules-derive-cfg.rs` (a `cfg_attr` expansion nested inside a `let` statement, nested inside an anonymous constant), combined with the extra inner attributes that rust-lang#129346 added to the simplified version. If nested replacement range support regresses again, this test fails.
The expected stdout was verified against current nightly; the sibling test's checked-in stdout reproduces byte-for-byte under the same setup.
Closesrust-lang#132727
…ovements, r=Kobzol
Minor `TokenStream` improvements
I found these while attempting to improve the `TokenStream` representation in rust-lang#159048.
r? @Kobzol
…li-obk
Separate `InterpCx` usage by `ConstAnalysis` phases
`ConstAnalysis` has a `RefCell<InterpCx>`. During the analysis phase the accesses are read-only, but the visiting phase (performed by `Collector`) requires mutation, because of calls to `try_make_constant`.
This commit removes the `RefCell` by having two `InterpCx` instances: a read-only one for the `ConstAnalysis` and a mutable one for the visiting phase, stored in `Collector`. This removes the need for the `OperandCollector::ecx` field, and for many `borrow`/`borrow_mut` calls.
r? @cjgillot
…=Kobzol
Clarify `push_stream`/`push_tree`
More `TokenStream` cleanups. Details in individual commits.
r? @Kobzol
@rust-borsrust-borsBot added the rollup A PR which is a rollup label Jul 20, 2026
@rustbotrustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Jul 20, 2026
@JonathanBrouwer

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1,i686-msvc-*

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

📌 Commit a429491 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Jul 20, 2026
@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
Rollup of 10 pull requests
try-job: dist-various-1
try-job: test-various
try-job: x86_64-gnu-aux
try-job: x86_64-gnu-llvm-21-3
try-job: x86_64-msvc-1
try-job: aarch64-apple
try-job: x86_64-mingw-1
try-job: i686-msvc-*
@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
…uwer
Rollup of 10 pull requests
Successful merges:
- #159600 (`rust-analyzer` subtree update)
- #158046 (proc_macro: preserve file module spans for inner attrs)
- #159000 (Small cleanups to the incr comp session code)
- #159449 (Enable single Location to issue multiple borrows)
- #159587 (Improve `AttrItem::span`)
- #159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- #159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- #159585 (Minor `TokenStream` improvements)
- #159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- #159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- #159590 (Remove some dead code)
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job aarch64-apple-macos-26 failed! Check out the build log: (web)(plain enhanced)(plain)

Click to see the possible cause of the failure (guessed by this bot)

Important

For more information how to resolve CI failures of this job, visit this link.

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

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

💔 Test for 9169afd failed: CI. Failed job:

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 62f6391 (62f6391c197cdbdc35751e032ab889628d8e0e0a)
Base parent: 14ead7d (14ead7d3d509f50efe9afb84673e65885dfd4d07)

@rust-borsrust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 20, 2026
@rustbotrustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 20, 2026
@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved due to being closed.

@JonathanBrouwer
JonathanBrouwer deleted the rollup-Sb6P4rP branch August 21, 2026 08:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributesArea: Attributes (`#[…]`, `#![…]`)rollupA PR which is a rollupS-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rust-analyzerRelevant to the rust-analyzer team, which will review and decide on the PR/issue.WG-trait-system-refactorThe Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

20 participants

@JonathanBrouwer@rust-log-analyzer@rustbot@ChayimFriedman2@UnknownHacker1@bjorn3@ShoyuVanilla@ada4a@Veykril@dfireBird@bit-aloo@Wilfred@cuishuang@A4-Tacks@mingley@RealRTTV@Yashb404@ribru17@adwinwhite@Dnreikronos
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Rollup of 10 pull requests - #159604

Closed
JonathanBrouwer wants to merge 113 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-Sb6P4rP
Closed

Rollup of 10 pull requests#159604
JonathanBrouwer wants to merge 113 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-Sb6P4rP

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

Create a similar rollup

ChayimFriedman2and others added 30 commits May 29, 2026 01:16
…onstant-sized
We used to set a `slice: None`.
The InvocationStrategy::Once path indexed world.flycheck[0] directly. The always!() above only logs in release builds, so when the list was empty it fell through and panicked with index out of bounds. Use first() and skip the restart when there is no handle.
Fixesrust-lang/rust-analyzer#21638
Previously we would still try to rename the incr comp session dir after
deleting it.
In both cases the incr comp session dir should no longer be accessed.
They should skip non-module scope (although I think they cannot skip and will do just fine), but must also process block module scopes.
internal: update links to `rustc_hir_analysis`
fix: Resolve non-plain paths in blocks correctly
…tpluxqp
feat: Treat library files as truly client immutable
…ztynowk
internal: Split out a session construct
feat: early late classification of lifetimes
…chenkov
Improve `AttrItem::span`
It has some shortcomings. Details in individual commits.
r? @petrochenkov
…, r=lcnr
Do not mark unnormalized const aliases as rigid when normalizing param env
Fixesrust-lang/trait-system-refactor-initiative#279
The old solver actually evaluates const aliases before normalizing param env.
The next solver should be consistent with that.
r? lcnr
also cc @BoxyUwU
…s-test, r=nnethercote
Add regression test for nested replacement ranges in `collect_tokens`
rust-lang#129346 removed support for nested replacement ranges in `collect_tokens`, and simplified the nesting out of `tests/ui/proc-macro/macro-rules-derive-cfg.rs` accordingly. That removal turned out to break real-world code, so it was reverted in rust-lang#132587 — but the revert only restored the compiler code, not the original nested shape of the test, leaving the nested case uncovered ever since.
This reinstates the nested case as a separate test: the pre-rust-lang/rust#129346 shape of `macro-rules-derive-cfg.rs` (a `cfg_attr` expansion nested inside a `let` statement, nested inside an anonymous constant), combined with the extra inner attributes that rust-lang#129346 added to the simplified version. If nested replacement range support regresses again, this test fails.
The expected stdout was verified against current nightly; the sibling test's checked-in stdout reproduces byte-for-byte under the same setup.
Closesrust-lang#132727
…ovements, r=Kobzol
Minor `TokenStream` improvements
I found these while attempting to improve the `TokenStream` representation in rust-lang#159048.
r? @Kobzol
…li-obk
Separate `InterpCx` usage by `ConstAnalysis` phases
`ConstAnalysis` has a `RefCell<InterpCx>`. During the analysis phase the accesses are read-only, but the visiting phase (performed by `Collector`) requires mutation, because of calls to `try_make_constant`.
This commit removes the `RefCell` by having two `InterpCx` instances: a read-only one for the `ConstAnalysis` and a mutable one for the visiting phase, stored in `Collector`. This removes the need for the `OperandCollector::ecx` field, and for many `borrow`/`borrow_mut` calls.
r? @cjgillot
…=Kobzol
Clarify `push_stream`/`push_tree`
More `TokenStream` cleanups. Details in individual commits.
r? @Kobzol
@rust-borsrust-borsBot added the rollup A PR which is a rollup label Jul 20, 2026
@rustbotrustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Jul 20, 2026
@JonathanBrouwer

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1,i686-msvc-*

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

📌 Commit a429491 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Jul 20, 2026
@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
Rollup of 10 pull requests
try-job: dist-various-1
try-job: test-various
try-job: x86_64-gnu-aux
try-job: x86_64-gnu-llvm-21-3
try-job: x86_64-msvc-1
try-job: aarch64-apple
try-job: x86_64-mingw-1
try-job: i686-msvc-*
@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
…uwer
Rollup of 10 pull requests
Successful merges:
- #159600 (`rust-analyzer` subtree update)
- #158046 (proc_macro: preserve file module spans for inner attrs)
- #159000 (Small cleanups to the incr comp session code)
- #159449 (Enable single Location to issue multiple borrows)
- #159587 (Improve `AttrItem::span`)
- #159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- #159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- #159585 (Minor `TokenStream` improvements)
- #159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- #159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- #159590 (Remove some dead code)
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job aarch64-apple-macos-26 failed! Check out the build log: (web)(plain enhanced)(plain)

Click to see the possible cause of the failure (guessed by this bot)

Important

For more information how to resolve CI failures of this job, visit this link.

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

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

💔 Test for 9169afd failed: CI. Failed job:

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 62f6391 (62f6391c197cdbdc35751e032ab889628d8e0e0a)
Base parent: 14ead7d (14ead7d3d509f50efe9afb84673e65885dfd4d07)

@rust-borsrust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 20, 2026
@rustbotrustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 20, 2026
@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved due to being closed.

@JonathanBrouwer
JonathanBrouwer deleted the rollup-Sb6P4rP branch August 21, 2026 08:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributesArea: Attributes (`#[…]`, `#![…]`)rollupA PR which is a rollupS-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rust-analyzerRelevant to the rust-analyzer team, which will review and decide on the PR/issue.WG-trait-system-refactorThe Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

20 participants

@JonathanBrouwer@rust-log-analyzer@rustbot@ChayimFriedman2@UnknownHacker1@bjorn3@ShoyuVanilla@ada4a@Veykril@dfireBird@bit-aloo@Wilfred@cuishuang@A4-Tacks@mingley@RealRTTV@Yashb404@ribru17@adwinwhite@Dnreikronos
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Rollup of 10 pull requests - #159604

Closed
JonathanBrouwer wants to merge 113 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-Sb6P4rP
Closed

Rollup of 10 pull requests#159604
JonathanBrouwer wants to merge 113 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-Sb6P4rP

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

Create a similar rollup

ChayimFriedman2and others added 30 commits May 29, 2026 01:16
…onstant-sized
We used to set a `slice: None`.
The InvocationStrategy::Once path indexed world.flycheck[0] directly. The always!() above only logs in release builds, so when the list was empty it fell through and panicked with index out of bounds. Use first() and skip the restart when there is no handle.
Fixesrust-lang/rust-analyzer#21638
Previously we would still try to rename the incr comp session dir after
deleting it.
In both cases the incr comp session dir should no longer be accessed.
They should skip non-module scope (although I think they cannot skip and will do just fine), but must also process block module scopes.
internal: update links to `rustc_hir_analysis`
fix: Resolve non-plain paths in blocks correctly
…tpluxqp
feat: Treat library files as truly client immutable
…ztynowk
internal: Split out a session construct
feat: early late classification of lifetimes
…chenkov
Improve `AttrItem::span`
It has some shortcomings. Details in individual commits.
r? @petrochenkov
…, r=lcnr
Do not mark unnormalized const aliases as rigid when normalizing param env
Fixesrust-lang/trait-system-refactor-initiative#279
The old solver actually evaluates const aliases before normalizing param env.
The next solver should be consistent with that.
r? lcnr
also cc @BoxyUwU
…s-test, r=nnethercote
Add regression test for nested replacement ranges in `collect_tokens`
rust-lang#129346 removed support for nested replacement ranges in `collect_tokens`, and simplified the nesting out of `tests/ui/proc-macro/macro-rules-derive-cfg.rs` accordingly. That removal turned out to break real-world code, so it was reverted in rust-lang#132587 — but the revert only restored the compiler code, not the original nested shape of the test, leaving the nested case uncovered ever since.
This reinstates the nested case as a separate test: the pre-rust-lang/rust#129346 shape of `macro-rules-derive-cfg.rs` (a `cfg_attr` expansion nested inside a `let` statement, nested inside an anonymous constant), combined with the extra inner attributes that rust-lang#129346 added to the simplified version. If nested replacement range support regresses again, this test fails.
The expected stdout was verified against current nightly; the sibling test's checked-in stdout reproduces byte-for-byte under the same setup.
Closesrust-lang#132727
…ovements, r=Kobzol
Minor `TokenStream` improvements
I found these while attempting to improve the `TokenStream` representation in rust-lang#159048.
r? @Kobzol
…li-obk
Separate `InterpCx` usage by `ConstAnalysis` phases
`ConstAnalysis` has a `RefCell<InterpCx>`. During the analysis phase the accesses are read-only, but the visiting phase (performed by `Collector`) requires mutation, because of calls to `try_make_constant`.
This commit removes the `RefCell` by having two `InterpCx` instances: a read-only one for the `ConstAnalysis` and a mutable one for the visiting phase, stored in `Collector`. This removes the need for the `OperandCollector::ecx` field, and for many `borrow`/`borrow_mut` calls.
r? @cjgillot
…=Kobzol
Clarify `push_stream`/`push_tree`
More `TokenStream` cleanups. Details in individual commits.
r? @Kobzol
@rust-borsrust-borsBot added the rollup A PR which is a rollup label Jul 20, 2026
@rustbotrustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Jul 20, 2026
@JonathanBrouwer

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1,i686-msvc-*

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

📌 Commit a429491 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Jul 20, 2026
@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
Rollup of 10 pull requests
try-job: dist-various-1
try-job: test-various
try-job: x86_64-gnu-aux
try-job: x86_64-gnu-llvm-21-3
try-job: x86_64-msvc-1
try-job: aarch64-apple
try-job: x86_64-mingw-1
try-job: i686-msvc-*
@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
…uwer
Rollup of 10 pull requests
Successful merges:
- #159600 (`rust-analyzer` subtree update)
- #158046 (proc_macro: preserve file module spans for inner attrs)
- #159000 (Small cleanups to the incr comp session code)
- #159449 (Enable single Location to issue multiple borrows)
- #159587 (Improve `AttrItem::span`)
- #159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- #159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- #159585 (Minor `TokenStream` improvements)
- #159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- #159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- #159590 (Remove some dead code)
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job aarch64-apple-macos-26 failed! Check out the build log: (web)(plain enhanced)(plain)

Click to see the possible cause of the failure (guessed by this bot)

Important

For more information how to resolve CI failures of this job, visit this link.

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

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

💔 Test for 9169afd failed: CI. Failed job:

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 62f6391 (62f6391c197cdbdc35751e032ab889628d8e0e0a)
Base parent: 14ead7d (14ead7d3d509f50efe9afb84673e65885dfd4d07)

@rust-borsrust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 20, 2026
@rustbotrustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 20, 2026
@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved due to being closed.

@JonathanBrouwer
JonathanBrouwer deleted the rollup-Sb6P4rP branch August 21, 2026 08:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributesArea: Attributes (`#[…]`, `#![…]`)rollupA PR which is a rollupS-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rust-analyzerRelevant to the rust-analyzer team, which will review and decide on the PR/issue.WG-trait-system-refactorThe Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

20 participants

@JonathanBrouwer@rust-log-analyzer@rustbot@ChayimFriedman2@UnknownHacker1@bjorn3@ShoyuVanilla@ada4a@Veykril@dfireBird@bit-aloo@Wilfred@cuishuang@A4-Tacks@mingley@RealRTTV@Yashb404@ribru17@adwinwhite@Dnreikronos
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Rollup of 10 pull requests - #159604

Closed
JonathanBrouwer wants to merge 113 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-Sb6P4rP
Closed

Rollup of 10 pull requests#159604
JonathanBrouwer wants to merge 113 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-Sb6P4rP

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

Create a similar rollup

ChayimFriedman2and others added 30 commits May 29, 2026 01:16
…onstant-sized
We used to set a `slice: None`.
The InvocationStrategy::Once path indexed world.flycheck[0] directly. The always!() above only logs in release builds, so when the list was empty it fell through and panicked with index out of bounds. Use first() and skip the restart when there is no handle.
Fixesrust-lang/rust-analyzer#21638
Previously we would still try to rename the incr comp session dir after
deleting it.
In both cases the incr comp session dir should no longer be accessed.
They should skip non-module scope (although I think they cannot skip and will do just fine), but must also process block module scopes.
internal: update links to `rustc_hir_analysis`
fix: Resolve non-plain paths in blocks correctly
…tpluxqp
feat: Treat library files as truly client immutable
…ztynowk
internal: Split out a session construct
feat: early late classification of lifetimes
…chenkov
Improve `AttrItem::span`
It has some shortcomings. Details in individual commits.
r? @petrochenkov
…, r=lcnr
Do not mark unnormalized const aliases as rigid when normalizing param env
Fixesrust-lang/trait-system-refactor-initiative#279
The old solver actually evaluates const aliases before normalizing param env.
The next solver should be consistent with that.
r? lcnr
also cc @BoxyUwU
…s-test, r=nnethercote
Add regression test for nested replacement ranges in `collect_tokens`
rust-lang#129346 removed support for nested replacement ranges in `collect_tokens`, and simplified the nesting out of `tests/ui/proc-macro/macro-rules-derive-cfg.rs` accordingly. That removal turned out to break real-world code, so it was reverted in rust-lang#132587 — but the revert only restored the compiler code, not the original nested shape of the test, leaving the nested case uncovered ever since.
This reinstates the nested case as a separate test: the pre-rust-lang/rust#129346 shape of `macro-rules-derive-cfg.rs` (a `cfg_attr` expansion nested inside a `let` statement, nested inside an anonymous constant), combined with the extra inner attributes that rust-lang#129346 added to the simplified version. If nested replacement range support regresses again, this test fails.
The expected stdout was verified against current nightly; the sibling test's checked-in stdout reproduces byte-for-byte under the same setup.
Closesrust-lang#132727
…ovements, r=Kobzol
Minor `TokenStream` improvements
I found these while attempting to improve the `TokenStream` representation in rust-lang#159048.
r? @Kobzol
…li-obk
Separate `InterpCx` usage by `ConstAnalysis` phases
`ConstAnalysis` has a `RefCell<InterpCx>`. During the analysis phase the accesses are read-only, but the visiting phase (performed by `Collector`) requires mutation, because of calls to `try_make_constant`.
This commit removes the `RefCell` by having two `InterpCx` instances: a read-only one for the `ConstAnalysis` and a mutable one for the visiting phase, stored in `Collector`. This removes the need for the `OperandCollector::ecx` field, and for many `borrow`/`borrow_mut` calls.
r? @cjgillot
…=Kobzol
Clarify `push_stream`/`push_tree`
More `TokenStream` cleanups. Details in individual commits.
r? @Kobzol
@rust-borsrust-borsBot added the rollup A PR which is a rollup label Jul 20, 2026
@rustbotrustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Jul 20, 2026
@JonathanBrouwer

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1,i686-msvc-*

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

📌 Commit a429491 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Jul 20, 2026
@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
Rollup of 10 pull requests
try-job: dist-various-1
try-job: test-various
try-job: x86_64-gnu-aux
try-job: x86_64-gnu-llvm-21-3
try-job: x86_64-msvc-1
try-job: aarch64-apple
try-job: x86_64-mingw-1
try-job: i686-msvc-*
@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
…uwer
Rollup of 10 pull requests
Successful merges:
- #159600 (`rust-analyzer` subtree update)
- #158046 (proc_macro: preserve file module spans for inner attrs)
- #159000 (Small cleanups to the incr comp session code)
- #159449 (Enable single Location to issue multiple borrows)
- #159587 (Improve `AttrItem::span`)
- #159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- #159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- #159585 (Minor `TokenStream` improvements)
- #159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- #159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- #159590 (Remove some dead code)
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job aarch64-apple-macos-26 failed! Check out the build log: (web)(plain enhanced)(plain)

Click to see the possible cause of the failure (guessed by this bot)

Important

For more information how to resolve CI failures of this job, visit this link.

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

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

💔 Test for 9169afd failed: CI. Failed job:

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 62f6391 (62f6391c197cdbdc35751e032ab889628d8e0e0a)
Base parent: 14ead7d (14ead7d3d509f50efe9afb84673e65885dfd4d07)

@rust-borsrust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 20, 2026
@rustbotrustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 20, 2026
@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved due to being closed.

@JonathanBrouwer
JonathanBrouwer deleted the rollup-Sb6P4rP branch August 21, 2026 08:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributesArea: Attributes (`#[…]`, `#![…]`)rollupA PR which is a rollupS-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rust-analyzerRelevant to the rust-analyzer team, which will review and decide on the PR/issue.WG-trait-system-refactorThe Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

20 participants

@JonathanBrouwer@rust-log-analyzer@rustbot@ChayimFriedman2@UnknownHacker1@bjorn3@ShoyuVanilla@ada4a@Veykril@dfireBird@bit-aloo@Wilfred@cuishuang@A4-Tacks@mingley@RealRTTV@Yashb404@ribru17@adwinwhite@Dnreikronos
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Rollup of 10 pull requests - #159604

Closed
JonathanBrouwer wants to merge 113 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-Sb6P4rP
Closed

Rollup of 10 pull requests#159604
JonathanBrouwer wants to merge 113 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-Sb6P4rP

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

Create a similar rollup

ChayimFriedman2and others added 30 commits May 29, 2026 01:16
…onstant-sized
We used to set a `slice: None`.
The InvocationStrategy::Once path indexed world.flycheck[0] directly. The always!() above only logs in release builds, so when the list was empty it fell through and panicked with index out of bounds. Use first() and skip the restart when there is no handle.
Fixesrust-lang/rust-analyzer#21638
Previously we would still try to rename the incr comp session dir after
deleting it.
In both cases the incr comp session dir should no longer be accessed.
They should skip non-module scope (although I think they cannot skip and will do just fine), but must also process block module scopes.
internal: update links to `rustc_hir_analysis`
fix: Resolve non-plain paths in blocks correctly
…tpluxqp
feat: Treat library files as truly client immutable
…ztynowk
internal: Split out a session construct
feat: early late classification of lifetimes
…chenkov
Improve `AttrItem::span`
It has some shortcomings. Details in individual commits.
r? @petrochenkov
…, r=lcnr
Do not mark unnormalized const aliases as rigid when normalizing param env
Fixesrust-lang/trait-system-refactor-initiative#279
The old solver actually evaluates const aliases before normalizing param env.
The next solver should be consistent with that.
r? lcnr
also cc @BoxyUwU
…s-test, r=nnethercote
Add regression test for nested replacement ranges in `collect_tokens`
rust-lang#129346 removed support for nested replacement ranges in `collect_tokens`, and simplified the nesting out of `tests/ui/proc-macro/macro-rules-derive-cfg.rs` accordingly. That removal turned out to break real-world code, so it was reverted in rust-lang#132587 — but the revert only restored the compiler code, not the original nested shape of the test, leaving the nested case uncovered ever since.
This reinstates the nested case as a separate test: the pre-rust-lang/rust#129346 shape of `macro-rules-derive-cfg.rs` (a `cfg_attr` expansion nested inside a `let` statement, nested inside an anonymous constant), combined with the extra inner attributes that rust-lang#129346 added to the simplified version. If nested replacement range support regresses again, this test fails.
The expected stdout was verified against current nightly; the sibling test's checked-in stdout reproduces byte-for-byte under the same setup.
Closesrust-lang#132727
…ovements, r=Kobzol
Minor `TokenStream` improvements
I found these while attempting to improve the `TokenStream` representation in rust-lang#159048.
r? @Kobzol
…li-obk
Separate `InterpCx` usage by `ConstAnalysis` phases
`ConstAnalysis` has a `RefCell<InterpCx>`. During the analysis phase the accesses are read-only, but the visiting phase (performed by `Collector`) requires mutation, because of calls to `try_make_constant`.
This commit removes the `RefCell` by having two `InterpCx` instances: a read-only one for the `ConstAnalysis` and a mutable one for the visiting phase, stored in `Collector`. This removes the need for the `OperandCollector::ecx` field, and for many `borrow`/`borrow_mut` calls.
r? @cjgillot
…=Kobzol
Clarify `push_stream`/`push_tree`
More `TokenStream` cleanups. Details in individual commits.
r? @Kobzol
@rust-borsrust-borsBot added the rollup A PR which is a rollup label Jul 20, 2026
@rustbotrustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Jul 20, 2026
@JonathanBrouwer

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1,i686-msvc-*

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

📌 Commit a429491 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Jul 20, 2026
@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
Rollup of 10 pull requests
try-job: dist-various-1
try-job: test-various
try-job: x86_64-gnu-aux
try-job: x86_64-gnu-llvm-21-3
try-job: x86_64-msvc-1
try-job: aarch64-apple
try-job: x86_64-mingw-1
try-job: i686-msvc-*
@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
…uwer
Rollup of 10 pull requests
Successful merges:
- #159600 (`rust-analyzer` subtree update)
- #158046 (proc_macro: preserve file module spans for inner attrs)
- #159000 (Small cleanups to the incr comp session code)
- #159449 (Enable single Location to issue multiple borrows)
- #159587 (Improve `AttrItem::span`)
- #159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- #159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- #159585 (Minor `TokenStream` improvements)
- #159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- #159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- #159590 (Remove some dead code)
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job aarch64-apple-macos-26 failed! Check out the build log: (web)(plain enhanced)(plain)

Click to see the possible cause of the failure (guessed by this bot)

Important

For more information how to resolve CI failures of this job, visit this link.

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

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

💔 Test for 9169afd failed: CI. Failed job:

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 62f6391 (62f6391c197cdbdc35751e032ab889628d8e0e0a)
Base parent: 14ead7d (14ead7d3d509f50efe9afb84673e65885dfd4d07)

@rust-borsrust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 20, 2026
@rustbotrustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 20, 2026
@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved due to being closed.

@JonathanBrouwer
JonathanBrouwer deleted the rollup-Sb6P4rP branch August 21, 2026 08:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributesArea: Attributes (`#[…]`, `#![…]`)rollupA PR which is a rollupS-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rust-analyzerRelevant to the rust-analyzer team, which will review and decide on the PR/issue.WG-trait-system-refactorThe Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

20 participants

@JonathanBrouwer@rust-log-analyzer@rustbot@ChayimFriedman2@UnknownHacker1@bjorn3@ShoyuVanilla@ada4a@Veykril@dfireBird@bit-aloo@Wilfred@cuishuang@A4-Tacks@mingley@RealRTTV@Yashb404@ribru17@adwinwhite@Dnreikronos