Move around {Idx, IndexVec, IndexSlice} adjacent code
#110539
Conversation
rustbot
added
A-query-system
|
Some changes occurred in compiler/rustc_codegen_cranelift cc @bjorn3 This PR changes MIR cc @oli-obk, @RalfJung, @JakobDegen, @davidtwco, @celinval, @vakaras Some changes occurred to the core trait solver cc @rust-lang/initiative-trait-system-refactor Some changes occurred to the CTFE / Miri engine cc @rust-lang/miri Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt |
WaffleLapkin
removed
A-query-system
This comment has been minimized.
This comment has been minimized.
rustbot
added
A-query-system
|
The Miri subtree was changed cc @rust-lang/miri Some changes occurred in src/librustdoc/clean/types.rs cc @camelid |
WaffleLapkin
changed the title
{Idx, IndexVec, IndexSlice} adjesent code{Idx, IndexVec, IndexSlice} adjacent code
|
☔ The latest upstream changes (presumably #109753) made this pull request unmergeable. Please resolve the merge conflicts. |
|
Great! |
rust-cloud-vms
bot
force-pushed
the
split_index_vec&slice
branch
from
d539dc1
to
c0daff0
Compare
|
@bors r=cjgillot rollup |
bors
added
S-waiting-on-bors
…, r=cjgillot
Move around `{Idx, IndexVec, IndexSlice}` adjacent code
r? `@scottmcm`
Rollup of 10 pull requests Successful merges: - rust-lang#110480 (Add `known-bug` tests for 11 unsound issues) - rust-lang#110539 (Move around `{Idx, IndexVec, IndexSlice}` adjacent code) - rust-lang#110590 (Add some tests around (lack of) object safety of associated types and consts) - rust-lang#110602 (Ignore src/bootstrap formatting commit in .git-blame-ignore-revs) - rust-lang#110667 (pointer-auth-link-with-c: Fix cross compilation.) - rust-lang#110681 (drop few unused crates, gate libc under unix for rustc_codegen_ssa) - rust-lang#110685 (Some cleanups to DataflowConstProp) - rust-lang#110744 (bootstrap: update paths cargo-credential crate) - rust-lang#110750 (Add size asserts for MIR `SourceScopeData` & `VarDebugInfo`) - rust-lang#110760 (rustdoc: Add regression test for rust-lang#60522) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
| if l < r { | ||
| return None; | ||
| }, | ||
| } | ||
| } |
There was a problem hiding this comment.
FWIW all the formatting changes in this file are un-done again in rust-lang/miri#2856. It would be better to avoid formatting changes in Miri code as part of rustc PRs.
What happens here is that Miri has a diferent rustfmt.toml than rustc, so if you have format-on-save enabled then working on Miri inside the rustc tree will use incorrect formatting. I am not sure how to avoid that (IMO the rustc settings have pretty bad impact on code in Miri so I'd prefer to keep our rustfmt config).
There was a problem hiding this comment.
Yeah, sorry. I know about this problem (it often happens with clippy...), but just didn't notice this time 😓
There was a problem hiding this comment.
Sounds like a RA feature request to disable format-on-save for some subfolders...
There was a problem hiding this comment.
I think if it could use the right config it would actually be better. I'll check with r-a people if this is possible.
|
I think the rustfmt people would be the right ones to talk to?
|
|
Maybe, I'm not sure... "r-a can execute rustfmt in such a way, that it sees the right config" and "rustfmt sees the right config by itself" both seem like plausible solutions. |
r? @scottmcm