Move stuff around on stable_mir and rustc_smir crate
#118266
Conversation
This file was getting too big and causing a lot of merge conflicts. All these changes shouldn't be visible to users since this module is private.
Separate items that are exposed in the `stable_mir` crate to be used by the compiler from items that we expect to be used by tool developers.
|
r? @spastorino (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
|
This PR changes Stable MIR cc @oli-obk, @celinval, @spastorino, @ouz-a |
compiler/stable_mir/src/lib.rs
Outdated
| use self::ty::{ImplDef, ImplTrait, IndexedVal, Span, TraitDecl, TraitDef, Ty}; | ||
| pub(crate) use crate::compiler_interface::with; | ||
| pub use crate::crate_def::CrateDef; | ||
| pub use crate::crate_def::DefId; | ||
| use crate::mir::pretty::function_name; | ||
| use crate::mir::Body; | ||
| use crate::mir::Mutability; | ||
| pub use error::*; | ||
| use std::fmt; | ||
| use std::fmt::Debug; | ||
| use std::{cell::Cell, io}; | ||
|
|
||
| use self::ty::{ | ||
| GenericPredicates, Generics, ImplDef, ImplTrait, IndexedVal, LineInfo, Span, TraitDecl, | ||
| TraitDef, Ty, TyKind, | ||
| }; | ||
| use std::io; |
There was a problem hiding this comment.
Microscopic nit: Since you're already touching all the imports, could you organize them by StdExternCrate order?
use std::fmt;
use std::fmt::Debug;
use std::io;
pub(crate) use compiler_interface::with;
pub use crate_def::{CrateDef, DefId};
pub use error::*;
use mir::pretty::function_name;
use mir::{Body, Mutability};
use ty::{ImplDef, ImplTrait, IndexedVal, Span, TraitDecl, TraitDef, Ty};
There was a problem hiding this comment.
Also, why is with re-exported here? You could probably just use crate::compiler_interface::with in all the dependency files, since compiler_interface is pub itself?
There was a problem hiding this comment.
Microscopic nit: Since you're already touching all the imports, could you organize them by StdExternCrate order?
Yes, I can re-organize the imports. I basically just used my IDE (clion) to organize the imports, and I believe it follows similar convention to https://doc.rust-lang.org/beta/style-guide/items.html. Question, is the StdExternCrate a compiler style preference or a Rust one?
Also, why is
withre-exported here? You could probably just usecrate::compiler_interface::within all the dependency files, sincecompiler_interfaceis pub itself?
Will do.
There was a problem hiding this comment.
Question, is the StdExternCrate a compiler style preference or a Rust one?
It's widely used in Rust, but to be honest, it's mostly a compiler-errors preference 😆
|
anyways r=me with or without making the imports easier to read, unless you want a specific review from santiago or oguz |
bors
added
S-waiting-on-bors
Rollup of 9 pull requests Successful merges: - rust-lang#118220 (general improvements/fixes on bootstrap) - rust-lang#118251 (rustdoc-search: avoid infinite where clause unbox) - rust-lang#118253 (Replace `option.map(cond) == Some(true)` with `option.is_some_and(cond)`) - rust-lang#118255 (Request that rust-analyzer changes are sent upstream first if possible) - rust-lang#118259 (Move EagerResolution to rustc_infer::infer::resolve) - rust-lang#118262 (Relate Inherent Associated Types using eq) - rust-lang#118266 (Move stuff around on `stable_mir` and `rustc_smir` crate) - rust-lang#118271 (Separate `NaN`/`Inf` floats with `_`) - rust-lang#118274 (Fix smir's `Ty::Ref` pretty printing) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of rust-lang#118266 - celinval:smir-break-files, r=compiler-errors Move stuff around on `stable_mir` and `rustc_smir` crate 1. Break down rustc_smir/mod.rs file. - This file was getting too big and causing a lot of merge conflicts. All these changes shouldn't be visible to users since this module is private. 2. Move the compiler interface defs to its own module - Separate items that are exposed in the `stable_mir` crate to be used by the compiler from items that we expect to be used by tool developers.
All these changes shouldn't be visible to users since this module is private.
stable_mircrate to be usedby the compiler from items that we expect to be used by tool developers.