Skip to content

Fix RustAnalyzer discovery of rustc's stable_mir crate#140532

Merged
bors merged 1 commit intorust-lang:masterfrom
celinval:chores-smir-ra
May 6, 2025
Merged

Fix RustAnalyzer discovery of rustc's stable_mir crate#140532
bors merged 1 commit intorust-lang:masterfrom
celinval:chores-smir-ra

Conversation

@celinval
Copy link
Contributor

@celinval celinval commented Apr 30, 2025

This fixes issues with RustAnalyzer not finding stable_mir crate since RA discovery traverses the dependency graph of rustc_driver crate.

This change also aligns with the long term architecture plan for these crates, since we are moving towards having stable_mir depend on rustc_smir and not the other way around. See this doc for more details.

I believe a similar function will come handy eventually for stable_mir users, but I'm keeping it as part of rustc_internal since its current format initializes the StableMir context and requires TyCtxt.

Finally, I added the rustc_internal module re-export under a feature since the APIs from this module shall not be stabilized.

@celinval
Change rustc_driver dependency on stable_mir crate
0f81fca 
This fixes issues with RustAnalyzer not finding stable_mir crate.
It is also part of the long term architecture plan for these crates,
since we are moving towards having stable_mir depend on rustc_smir and
not the other way around.

I believe this is an utility function that will come handy eventually
for stable_mir users, but I'm keeping it as part of rustc_internal since
it initializes the StableMir context and requires `TyCtxt`.

Finally, I added the rustc_internal crate under a feature since the APIs
from this module shall not be stabilized.
@rustbot
Copy link
Collaborator

rustbot commented Apr 30, 2025

r? @oli-obk

rustbot has assigned @oli-obk.
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

@rustbot rustbot added 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. labels Apr 30, 2025
@rustbot
Copy link
Collaborator

rustbot commented Apr 30, 2025

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

This PR changes Stable MIR

cc @oli-obk, @celinval, @ouz-a

@oli-obk
Copy link
Contributor

oli-obk commented May 2, 2025

Does it also work if you just add it to

rust/src/etc/rust_analyzer_settings.json

Line 13 in d1e82ba

"compiler/rustc_codegen_gcc/Cargo.toml",
? Or does that cause too much churn somewhere?

@celinval
Copy link
Contributor Author

celinval commented May 2, 2025

Does it also work if you just add it to

rust/src/etc/rust_analyzer_settings.json

Line 13 in d1e82ba

"compiler/rustc_codegen_gcc/Cargo.toml",

? Or does that cause too much churn somewhere?

Good question, I don't know. That said, I do think we'll need this change no matter what.

@makai410
Copy link
Member

makai410 commented May 3, 2025

Yes I was also considering this change since currently rustc_internal has to depend on stable_mir to initialize the StableMIR, and we can't avoid the cyclic dependency if we keep rustc_internal in rustc_smir.

@oli-obk
Copy link
Contributor

oli-obk commented May 5, 2025

Ah yea, makes sense

@bors r+

@bors
Copy link
Collaborator

bors commented May 5, 2025

📌 Commit 0f81fca has been approved by oli-obk

It is now in the queue for this repository.

@bors bors 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 May 5, 2025
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request May 5, 2025
@GuillaumeGomez
Rollup merge of rust-lang#140532 - celinval:chores-smir-ra, r=oli-obk
cd789a2 
Fix RustAnalyzer discovery of rustc's `stable_mir` crate

This fixes issues with RustAnalyzer not finding `stable_mir` crate since RA discovery traverses the dependency graph of `rustc_driver` crate.

This change also aligns with the long term architecture plan for these crates, since we are moving towards having stable_mir depend on rustc_smir and not the other way around. See [this doc](https://hackmd.io/jBRkZLqAQL2EVgwIIeNMHg) for more details.

I believe a similar function will come handy eventually for `stable_mir` users, but I'm keeping it as part of `rustc_internal` since its current format initializes the StableMir context and requires `TyCtxt`.

Finally, I added the `rustc_internal` module re-export under a feature since the APIs from this module shall not be stabilized.
@GuillaumeGomez GuillaumeGomez mentioned this pull request May 5, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request May 5, 2025
@bors
Auto merge of rust-lang#140674 - GuillaumeGomez:rollup-x9tjva8, r=Gui…
a45dc87 
…llaumeGomez

Rollup of 11 pull requests

Successful merges:

 - rust-lang#139764 (Consistent trait bounds for ExtractIf Debug impls)
 - rust-lang#140035 (Implement RFC 3503: frontmatters)
 - rust-lang#140080 (mir-opt: Use one MirPatch in MatchBranchSimplification)
 - rust-lang#140115 (mir-opt: execute MatchBranchSimplification after GVN)
 - rust-lang#140357 (bypass linker configuration and cross target check on `x check`)
 - rust-lang#140374 (Resolve instance for SymFn in global/naked asm)
 - rust-lang#140393 (std: get rid of `sys_common::process`)
 - rust-lang#140532 (Fix RustAnalyzer discovery of rustc's `stable_mir` crate)
 - rust-lang#140559 (Removing rustc_type_ir in the rustc_infer codebase)
 - rust-lang#140636 (implement `PanicTracker` to track `t` panics)
 - rust-lang#140661 (Make `-Zfixed-x18` into a target modifier)

r? `@ghost`
`@rustbot` modify labels: rollup
Zalathar added a commit to Zalathar/rust that referenced this pull request May 6, 2025
@Zalathar
Rollup merge of rust-lang#140532 - celinval:chores-smir-ra, r=oli-obk
e650155 
Fix RustAnalyzer discovery of rustc's `stable_mir` crate

This fixes issues with RustAnalyzer not finding `stable_mir` crate since RA discovery traverses the dependency graph of `rustc_driver` crate.

This change also aligns with the long term architecture plan for these crates, since we are moving towards having stable_mir depend on rustc_smir and not the other way around. See [this doc](https://hackmd.io/jBRkZLqAQL2EVgwIIeNMHg) for more details.

I believe a similar function will come handy eventually for `stable_mir` users, but I'm keeping it as part of `rustc_internal` since its current format initializes the StableMir context and requires `TyCtxt`.

Finally, I added the `rustc_internal` module re-export under a feature since the APIs from this module shall not be stabilized.
@Zalathar Zalathar mentioned this pull request May 6, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request May 6, 2025
@bors
Auto merge of rust-lang#140690 - Zalathar:rollup-f8sxwp1, r=Zalathar
d47fac7 
Rollup of 12 pull requests

Successful merges:

 - rust-lang#139550 (Fix `-Zremap-path-scope` rmeta handling)
 - rust-lang#139773 (Implement `Iterator::last` for `vec::IntoIter`)
 - rust-lang#140035 (Implement RFC 3503: frontmatters)
 - rust-lang#140176 (Fix linking statics on Arm64EC)
 - rust-lang#140251 (coverage-dump: Resolve global file IDs to filenames)
 - rust-lang#140393 (std: get rid of `sys_common::process`)
 - rust-lang#140532 (Fix RustAnalyzer discovery of rustc's `stable_mir` crate)
 - rust-lang#140598 (Steer docs to `utf8_chunks` and `Iterator::take`)
 - rust-lang#140634 (Use more accurate ELF flags on MIPS)
 - rust-lang#140673 (Clean rustdoc tests folder)
 - rust-lang#140678 (Be a bit more relaxed about not yet constrained infer vars in closure upvar analysis)
 - rust-lang#140687 (Update mdbook to 0.4.49)

r? `@ghost`
`@rustbot` modify labels: rollup
@Zalathar Zalathar mentioned this pull request May 6, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 6, 2025
@bors
Auto merge of rust-lang#140695 - Zalathar:rollup-i32gzbo, r=Zalathar
651e9cf 
Rollup of 12 pull requests

Successful merges:

 - rust-lang#139550 (Fix `-Zremap-path-scope` rmeta handling)
 - rust-lang#139764 (Consistent trait bounds for ExtractIf Debug impls)
 - rust-lang#139773 (Implement `Iterator::last` for `vec::IntoIter`)
 - rust-lang#140035 (Implement RFC 3503: frontmatters)
 - rust-lang#140251 (coverage-dump: Resolve global file IDs to filenames)
 - rust-lang#140393 (std: get rid of `sys_common::process`)
 - rust-lang#140532 (Fix RustAnalyzer discovery of rustc's `stable_mir` crate)
 - rust-lang#140598 (Steer docs to `utf8_chunks` and `Iterator::take`)
 - rust-lang#140634 (Use more accurate ELF flags on MIPS)
 - rust-lang#140673 (Clean rustdoc tests folder)
 - rust-lang#140678 (Be a bit more relaxed about not yet constrained infer vars in closure upvar analysis)
 - rust-lang#140687 (Update mdbook to 0.4.49)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7ea3350 into rust-lang:master May 6, 2025
6 checks passed
@rustbot rustbot added this to the 1.88.0 milestone May 6, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 6, 2025
@rust-timer
Unrolled build for rust-lang#140532
68c9f5e 
Rollup merge of rust-lang#140532 - celinval:chores-smir-ra, r=oli-obk

Fix RustAnalyzer discovery of rustc's `stable_mir` crate

This fixes issues with RustAnalyzer not finding `stable_mir` crate since RA discovery traverses the dependency graph of `rustc_driver` crate.

This change also aligns with the long term architecture plan for these crates, since we are moving towards having stable_mir depend on rustc_smir and not the other way around. See [this doc](https://hackmd.io/jBRkZLqAQL2EVgwIIeNMHg) for more details.

I believe a similar function will come handy eventually for `stable_mir` users, but I'm keeping it as part of `rustc_internal` since its current format initializes the StableMir context and requires `TyCtxt`.

Finally, I added the `rustc_internal` module re-export under a feature since the APIs from this module shall not be stabilized.
rust-cloud-vms bot pushed a commit to makai410/rust that referenced this pull request May 11, 2025
@makai410
refactor: move IndexMap to rustc_smir
c8f00a1 
we should no longer keep `IndexMap` in `rustc_internal`, as we've decided to migrate `rustc_internal` to `stable_mir` under a feature (rust-lang#140532).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@oli-obk oli-obk

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.88.0

Development

Successfully merging this pull request may close these issues.

5 participants

@celinval @rustbot @oli-obk @makai410 @bors