Skip to content

Commit 89ee41c

Browse files
authored
Rollup merge of rust-lang#136847 - nnethercote:simplify-intra-crate-quals, r=oli-obk
Simplify intra-crate qualifiers. The following is a weird pattern for a file within `rustc_middle`: ``` use rustc_middle::aaa; use crate::bbb; ``` More sensible and standard would be this: ``` use crate::{aaa, bbb}; ``` I.e. we generally prefer using `crate::` to using a crate's own name. (Exceptions are things like in macros where `crate::` doesn't work because the macro is used in multiple crates.) This commit fixes a bunch of these weird qualifiers. r? `@jieyouxu`
2 parents 8ade6ba + af60203 commit 89ee41c

File tree

20 files changed

+53
-51
lines changed

20 files changed

+53
-51
lines changed

compiler/rustc_errors/src/diagnostic_impls.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,13 @@ impl<I: rustc_type_ir::Interner> IntoDiagArg for rustc_type_ir::ExistentialTrait
108108
}
109109

110110
impl<I: rustc_type_ir::Interner> IntoDiagArg for rustc_type_ir::UnevaluatedConst<I> {
111-
fn into_diag_arg(self) -> rustc_errors::DiagArgValue {
111+
fn into_diag_arg(self) -> DiagArgValue {
112112
format!("{self:?}").into_diag_arg()
113113
}
114114
}
115115

116116
impl<I: rustc_type_ir::Interner> IntoDiagArg for rustc_type_ir::FnSig<I> {
117-
fn into_diag_arg(self) -> rustc_errors::DiagArgValue {
117+
fn into_diag_arg(self) -> DiagArgValue {
118118
format!("{self:?}").into_diag_arg()
119119
}
120120
}

compiler/rustc_middle/src/hir/map/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@ use rustc_hir::definitions::{DefKey, DefPath, DefPathHash};
1010
use rustc_hir::intravisit::Visitor;
1111
use rustc_hir::*;
1212
use rustc_hir_pretty as pprust_hir;
13-
use rustc_middle::hir::nested_filter;
1413
use rustc_span::def_id::StableCrateId;
1514
use rustc_span::{ErrorGuaranteed, Ident, Span, Symbol, kw, sym, with_metavar_spans};
1615

17-
use crate::hir::ModuleItems;
16+
use crate::hir::{ModuleItems, nested_filter};
1817
use crate::middle::debugger_visualizer::DebuggerVisualizerFile;
1918
use crate::query::LocalCrate;
2019
use crate::ty::TyCtxt;

compiler/rustc_middle/src/middle/stability.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use rustc_feature::GateIssue;
1313
use rustc_hir::def_id::{DefId, LocalDefId, LocalDefIdMap};
1414
use rustc_hir::{self as hir, HirId};
1515
use rustc_macros::{Decodable, Encodable, HashStable, Subdiagnostic};
16-
use rustc_middle::ty::print::with_no_trimmed_paths;
1716
use rustc_session::Session;
1817
use rustc_session::lint::builtin::{DEPRECATED, DEPRECATED_IN_FUTURE, SOFT_UNSTABLE};
1918
use rustc_session::lint::{BuiltinLintDiag, DeprecatedSinceKind, Level, Lint, LintBuffer};
@@ -23,6 +22,7 @@ use tracing::debug;
2322

2423
pub use self::StabilityLevel::*;
2524
use crate::ty::TyCtxt;
25+
use crate::ty::print::with_no_trimmed_paths;
2626

2727
#[derive(PartialEq, Clone, Copy, Debug)]
2828
pub enum StabilityLevel {

compiler/rustc_middle/src/mir/generic_graph.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use gsgdt::{Edge, Graph, Node, NodeStyle};
2-
use rustc_middle::mir::*;
2+
3+
use crate::mir::*;
34

45
/// Convert an MIR function into a gsgdt Graph
56
pub(crate) fn mir_fn_to_generic_graph<'tcx>(tcx: TyCtxt<'tcx>, body: &Body<'_>) -> Graph {

compiler/rustc_middle/src/mir/generic_graphviz.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ use std::io::{self, Write};
22

33
use rustc_data_structures::graph::{self, iterate};
44
use rustc_graphviz as dot;
5-
use rustc_middle::ty::TyCtxt;
5+
6+
use crate::ty::TyCtxt;
67

78
pub struct GraphvizWriter<
89
'a,

compiler/rustc_middle/src/mir/graphviz.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ use std::io::{self, Write};
22

33
use gsgdt::GraphvizSettings;
44
use rustc_graphviz as dot;
5-
use rustc_middle::mir::*;
65

76
use super::generic_graph::mir_fn_to_generic_graph;
87
use super::pretty::dump_mir_def_ids;
8+
use crate::mir::*;
99

1010
/// Write a graphviz DOT graph of a list of MIRs.
1111
pub fn write_mir_graphviz<W>(tcx: TyCtxt<'_>, single: Option<DefId>, w: &mut W) -> io::Result<()>

compiler/rustc_middle/src/mir/interpret/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ use rustc_data_structures::sync::{AtomicU64, Lock};
2020
use rustc_hir::def::DefKind;
2121
use rustc_hir::def_id::{DefId, LocalDefId};
2222
use rustc_macros::{HashStable, TyDecodable, TyEncodable, TypeFoldable, TypeVisitable};
23-
use rustc_middle::ty::print::with_no_trimmed_paths;
2423
use rustc_serialize::{Decodable, Encodable};
2524
use tracing::{debug, trace};
2625
// Also make the error macros available from this module.
@@ -46,6 +45,7 @@ pub use self::pointer::{CtfeProvenance, Pointer, PointerArithmetic, Provenance};
4645
pub use self::value::Scalar;
4746
use crate::mir;
4847
use crate::ty::codec::{TyDecoder, TyEncoder};
48+
use crate::ty::print::with_no_trimmed_paths;
4949
use crate::ty::{self, Instance, Ty, TyCtxt};
5050

5151
/// Uniquely identifies one of the following:

compiler/rustc_middle/src/mir/patch.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
use rustc_middle::mir::*;
21
use tracing::debug;
32

3+
use crate::mir::*;
4+
45
/// This struct represents a patch to MIR, which can add
56
/// new statements and basic blocks and patch over block
67
/// terminators.

compiler/rustc_middle/src/mir/pretty.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@ use std::{fs, io};
55

66
use rustc_abi::Size;
77
use rustc_ast::InlineAsmTemplatePiece;
8-
use rustc_middle::mir::interpret::{
9-
AllocBytes, AllocId, Allocation, GlobalAlloc, Pointer, Provenance, alloc_range,
10-
read_target_uint,
11-
};
12-
use rustc_middle::mir::visit::Visitor;
13-
use rustc_middle::mir::*;
148
use tracing::trace;
159
use ty::print::PrettyPrinter;
1610

1711
use super::graphviz::write_mir_fn_graphviz;
18-
use crate::mir::interpret::ConstAllocation;
12+
use crate::mir::interpret::{
13+
AllocBytes, AllocId, Allocation, ConstAllocation, GlobalAlloc, Pointer, Provenance,
14+
alloc_range, read_target_uint,
15+
};
16+
use crate::mir::visit::Visitor;
17+
use crate::mir::*;
1918

2019
const INDENT: &str = " ";
2120
/// Alignment for lining up comments following MIR statements

compiler/rustc_middle/src/query/erase.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ impl<T> EraseType for Result<&'_ T, &'_ ty::layout::FnAbiError<'_>> {
101101
type Result = [u8; size_of::<Result<&'static (), &'static ty::layout::FnAbiError<'static>>>()];
102102
}
103103

104-
impl<T> EraseType for Result<(&'_ T, rustc_middle::thir::ExprId), rustc_errors::ErrorGuaranteed> {
104+
impl<T> EraseType for Result<(&'_ T, crate::thir::ExprId), rustc_errors::ErrorGuaranteed> {
105105
type Result = [u8; size_of::<
106-
Result<(&'static (), rustc_middle::thir::ExprId), rustc_errors::ErrorGuaranteed>,
106+
Result<(&'static (), crate::thir::ExprId), rustc_errors::ErrorGuaranteed>,
107107
>()];
108108
}
109109

0 commit comments

Comments
 (0)