Skip to content

Commit 8bd3d24

Browse files
CentrilCentril
committed
nix syntax::errors & prefer rustc_errors over errors
1 parent 2d8d559 commit 8bd3d24

File tree

138 files changed

+242
-276
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+242
-276
lines changed

Diff for: ‎Cargo.lock

+1
Original file line numberDiff line numberDiff line change
@@ -3653,6 +3653,7 @@ dependencies = [
36533653
"log",
36543654
"rustc",
36553655
"rustc_data_structures",
3656+
"rustc_errors",
36563657
"rustc_feature",
36573658
"rustc_hir",
36583659
"rustc_index",

Diff for: ‎src/librustc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ rustc_hir = { path = "../librustc_hir" }
2626
rustc_target = { path = "../librustc_target" }
2727
rustc_macros = { path = "../librustc_macros" }
2828
rustc_data_structures = { path = "../librustc_data_structures" }
29+
rustc_errors = { path = "../librustc_errors" }
2930
rustc_index = { path = "../librustc_index" }
30-
errors = { path = "../librustc_errors", package = "rustc_errors" }
3131
rustc_serialize = { path = "../libserialize", package = "serialize" }
3232
syntax = { path = "../libsyntax" }
3333
rustc_span = { path = "../librustc_span" }

Diff for: ‎src/librustc/dep_graph/graph.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use crate::ty::{self, TyCtxt};
2-
use errors::Diagnostic;
32
use parking_lot::{Condvar, Mutex};
43
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
54
use rustc_data_structures::sharded::{self, Sharded};
65
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
76
use rustc_data_structures::sync::{AtomicU32, AtomicU64, Lock, Lrc, Ordering};
7+
use rustc_errors::Diagnostic;
88
use rustc_index::vec::{Idx, IndexVec};
99
use smallvec::SmallVec;
1010
use std::collections::hash_map::Entry;

Diff for: ‎src/librustc/hir/check_attr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ use crate::lint::builtin::UNUSED_ATTRIBUTES;
99
use crate::ty::query::Providers;
1010
use crate::ty::TyCtxt;
1111

12-
use errors::struct_span_err;
1312
use rustc_error_codes::*;
13+
use rustc_errors::struct_span_err;
1414
use rustc_hir as hir;
1515
use rustc_hir::def_id::DefId;
1616
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};

Diff for: ‎src/librustc/infer/error_reporting/mod.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,13 @@ use crate::ty::{
6464
subst::{Subst, SubstsRef},
6565
Region, Ty, TyCtxt, TypeFoldable,
6666
};
67+
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
68+
use rustc_error_codes::*;
69+
use rustc_errors::{pluralize, struct_span_err};
70+
use rustc_errors::{Applicability, DiagnosticBuilder, DiagnosticStyledString};
6771
use rustc_hir as hir;
6872
use rustc_hir::def_id::DefId;
6973
use rustc_hir::Node;
70-
71-
use errors::{
72-
pluralize, struct_span_err, Applicability, DiagnosticBuilder, DiagnosticStyledString,
73-
};
74-
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
75-
use rustc_error_codes::*;
7674
use rustc_span::{DesugaringKind, Pos, Span};
7775
use rustc_target::spec::abi;
7876
use std::{cmp, fmt};

Diff for: ‎src/librustc/infer/error_reporting/need_type_info.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::infer::type_variable::TypeVariableOriginKind;
33
use crate::infer::InferCtxt;
44
use crate::ty::print::Print;
55
use crate::ty::{self, DefIdTree, Infer, Ty, TyVar};
6-
use errors::{struct_span_err, Applicability, DiagnosticBuilder};
6+
use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder};
77
use rustc_hir as hir;
88
use rustc_hir::def::{DefKind, Namespace};
99
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
@@ -151,12 +151,12 @@ pub enum TypeAnnotationNeeded {
151151
E0284,
152152
}
153153

154-
impl Into<errors::DiagnosticId> for TypeAnnotationNeeded {
155-
fn into(self) -> errors::DiagnosticId {
154+
impl Into<rustc_errors::DiagnosticId> for TypeAnnotationNeeded {
155+
fn into(self) -> rustc_errors::DiagnosticId {
156156
match self {
157-
Self::E0282 => errors::error_code!(E0282),
158-
Self::E0283 => errors::error_code!(E0283),
159-
Self::E0284 => errors::error_code!(E0284),
157+
Self::E0282 => rustc_errors::error_code!(E0282),
158+
Self::E0283 => rustc_errors::error_code!(E0283),
159+
Self::E0284 => rustc_errors::error_code!(E0284),
160160
}
161161
}
162162
}

Diff for: ‎src/librustc/infer/error_reporting/nice_region_error/different_lifetimes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use crate::infer::error_reporting::nice_region_error::util::AnonymousParamInfo;
55
use crate::infer::error_reporting::nice_region_error::NiceRegionError;
66
use crate::util::common::ErrorReported;
77

8-
use errors::struct_span_err;
98
use rustc_error_codes::*;
9+
use rustc_errors::struct_span_err;
1010

1111
impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
1212
/// Print the error message for lifetime errors when both the concerned regions are anonymous.

Diff for: ‎src/librustc/infer/error_reporting/nice_region_error/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::infer::lexical_region_resolve::RegionResolutionError::*;
33
use crate::infer::InferCtxt;
44
use crate::ty::{self, TyCtxt};
55
use crate::util::common::ErrorReported;
6-
use errors::DiagnosticBuilder;
6+
use rustc_errors::DiagnosticBuilder;
77
use rustc_span::source_map::Span;
88

99
mod different_lifetimes;

Diff for: ‎src/librustc/infer/error_reporting/nice_region_error/named_anon_conflict.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//! where one region is named and the other is anonymous.
33
use crate::infer::error_reporting::nice_region_error::NiceRegionError;
44
use crate::ty;
5-
use errors::{struct_span_err, Applicability, DiagnosticBuilder};
5+
use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder};
66
use rustc_hir::{FunctionRetTy, TyKind};
77

88
use rustc_error_codes::*;

Diff for: ‎src/librustc/infer/error_reporting/nice_region_error/placeholder_error.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::ty::error::ExpectedFound;
77
use crate::ty::print::{FmtPrinter, Print, RegionHighlightMode};
88
use crate::ty::subst::SubstsRef;
99
use crate::ty::{self, TyCtxt};
10-
use errors::DiagnosticBuilder;
10+
use rustc_errors::DiagnosticBuilder;
1111
use rustc_hir::def::Namespace;
1212
use rustc_hir::def_id::DefId;
1313

Diff for: ‎src/librustc/infer/error_reporting/nice_region_error/static_impl_trait.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::infer::error_reporting::nice_region_error::NiceRegionError;
55
use crate::infer::lexical_region_resolve::RegionResolutionError;
66
use crate::ty::{BoundRegion, FreeRegion, RegionKind};
77
use crate::util::common::ErrorReported;
8-
use errors::Applicability;
8+
use rustc_errors::Applicability;
99

1010
impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
1111
/// Print the error message for lifetime errors when the return type is a static impl Trait.

Diff for: ‎src/librustc/infer/error_reporting/note.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::infer::{self, InferCtxt, SubregionOrigin};
33
use crate::middle::region;
44
use crate::ty::error::TypeError;
55
use crate::ty::{self, Region};
6-
use errors::{struct_span_err, DiagnosticBuilder};
6+
use rustc_errors::{struct_span_err, DiagnosticBuilder};
77

88
use rustc_error_codes::*;
99

Diff for: ‎src/librustc/infer/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ use crate::ty::subst::{GenericArg, InternalSubsts, SubstsRef};
2121
use crate::ty::{self, GenericParamDefKind, InferConst, Ty, TyCtxt};
2222
use crate::ty::{ConstVid, FloatVid, IntVid, TyVid};
2323

24-
use errors::DiagnosticBuilder;
2524
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
2625
use rustc_data_structures::sync::Lrc;
2726
use rustc_data_structures::unify as ut;
27+
use rustc_errors::DiagnosticBuilder;
2828
use rustc_hir as hir;
2929
use rustc_hir::def_id::DefId;
3030
use rustc_span::symbol::Symbol;

Diff for: ‎src/librustc/infer/opaque_types/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ use crate::ty::fold::{BottomUpFolder, TypeFoldable, TypeFolder, TypeVisitor};
66
use crate::ty::free_region_map::FreeRegionRelations;
77
use crate::ty::subst::{GenericArg, GenericArgKind, InternalSubsts, SubstsRef};
88
use crate::ty::{self, GenericParamDefKind, Ty, TyCtxt};
9-
use errors::{struct_span_err, DiagnosticBuilder};
109
use rustc::session::config::nightly_options;
1110
use rustc_data_structures::fx::FxHashMap;
1211
use rustc_data_structures::sync::Lrc;
12+
use rustc_errors::{struct_span_err, DiagnosticBuilder};
1313
use rustc_hir as hir;
1414
use rustc_hir::def_id::{DefId, DefIdMap};
1515
use rustc_hir::Node;

Diff for: ‎src/librustc/lint/builtin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use crate::lint::{FutureIncompatibleInfo, LateLintPass, LintArray, LintPass};
88
use crate::middle::stability;
99
use crate::session::Session;
10-
use errors::{pluralize, Applicability, DiagnosticBuilder};
10+
use rustc_errors::{pluralize, Applicability, DiagnosticBuilder};
1111
use rustc_session::declare_lint;
1212
use rustc_span::edition::Edition;
1313
use rustc_span::source_map::Span;

Diff for: ‎src/librustc/lint/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ use crate::middle::privacy::AccessLevels;
2525
use crate::session::Session;
2626
use crate::ty::layout::{LayoutError, LayoutOf, TyLayout};
2727
use crate::ty::{self, print::Printer, subst::GenericArg, Ty, TyCtxt};
28-
use errors::{struct_span_err, DiagnosticBuilder};
2928
use rustc_data_structures::fx::FxHashMap;
3029
use rustc_data_structures::sync;
3130
use rustc_error_codes::*;
31+
use rustc_errors::{struct_span_err, DiagnosticBuilder};
3232
use rustc_hir as hir;
3333
use rustc_hir::def_id::{CrateNum, DefId};
3434
use rustc_span::{symbol::Symbol, MultiSpan, Span, DUMMY_SP};

Diff for: ‎src/librustc/lint/internal.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
use crate::lint::{
55
EarlyContext, EarlyLintPass, LateContext, LateLintPass, LintArray, LintContext, LintPass,
66
};
7-
use errors::Applicability;
87
use rustc_data_structures::fx::FxHashMap;
8+
use rustc_errors::Applicability;
99
use rustc_hir::{GenericArg, HirId, MutTy, Mutability, Path, PathSegment, QPath, Ty, TyKind};
1010
use rustc_session::declare_tool_lint;
1111
use rustc_span::symbol::{sym, Symbol};

Diff for: ‎src/librustc/lint/levels.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ use crate::lint::builtin;
55
use crate::lint::context::{CheckLintNameResult, LintStore};
66
use crate::lint::{self, Level, Lint, LintId, LintSource};
77
use crate::session::Session;
8-
use errors::{struct_span_err, Applicability, DiagnosticBuilder};
98
use rustc_data_structures::fx::FxHashMap;
109
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
10+
use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder};
1111
use rustc_hir::HirId;
1212
use rustc_span::source_map::MultiSpan;
1313
use rustc_span::symbol::{sym, Symbol};

Diff for: ‎src/librustc/lint/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ pub use self::LintSource::*;
2323

2424
use crate::lint::builtin::BuiltinLintDiagnostics;
2525
use crate::ty::TyCtxt;
26-
use errors::{DiagnosticBuilder, DiagnosticId};
2726
use rustc_data_structures::sync;
27+
use rustc_errors::{DiagnosticBuilder, DiagnosticId};
2828
use rustc_hir as hir;
2929
use rustc_session::node_id::NodeMap;
3030
use rustc_session::{DiagnosticMessageId, Session};

Diff for: ‎src/librustc/middle/lang_items.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ use crate::middle::cstore::ExternCrate;
1414
use crate::middle::weak_lang_items;
1515
use crate::ty::{self, TyCtxt};
1616

17-
use errors::struct_span_err;
1817
use rustc_data_structures::fx::FxHashMap;
18+
use rustc_errors::struct_span_err;
1919
use rustc_hir as hir;
2020
use rustc_hir::def_id::DefId;
2121
use rustc_hir::itemlikevisit::ItemLikeVisitor;

Diff for: ‎src/librustc/middle/stability.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ use crate::lint::builtin::BuiltinLintDiagnostics;
77
use crate::lint::{self, in_derive_expansion, Lint};
88
use crate::session::{DiagnosticMessageId, Session};
99
use crate::ty::{self, TyCtxt};
10-
use errors::DiagnosticBuilder;
1110
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
11+
use rustc_errors::{Applicability, DiagnosticBuilder};
1212
use rustc_feature::GateIssue;
1313
use rustc_hir as hir;
1414
use rustc_hir::def::DefKind;
@@ -18,7 +18,6 @@ use rustc_span::symbol::{sym, Symbol};
1818
use rustc_span::{MultiSpan, Span};
1919
use syntax::ast::CRATE_NODE_ID;
2020
use syntax::attr::{self, ConstStability, Deprecation, RustcDeprecation, Stability};
21-
use syntax::errors::Applicability;
2221
use syntax::feature_gate::feature_err_issue;
2322

2423
use std::num::NonZeroU32;

Diff for: ‎src/librustc/middle/weak_lang_items.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use crate::session::config;
55

66
use crate::hir::map::Map;
77
use crate::ty::TyCtxt;
8-
use errors::struct_span_err;
98
use rustc_data_structures::fx::FxHashSet;
9+
use rustc_errors::struct_span_err;
1010
use rustc_hir as hir;
1111
use rustc_hir::def_id::DefId;
1212
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};

Diff for: ‎src/librustc/mir/interpret/error.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ use crate::ty::query::TyCtxtAt;
77
use crate::ty::{self, layout, Ty};
88

99
use backtrace::Backtrace;
10-
use errors::{struct_span_err, DiagnosticBuilder};
1110
use hir::GeneratorKind;
11+
use rustc_errors::{struct_span_err, DiagnosticBuilder};
1212
use rustc_hir as hir;
1313
use rustc_macros::HashStable;
1414
use rustc_span::symbol::Symbol;

Diff for: ‎src/librustc/traits/coherence.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pub struct OverlapResult<'tcx> {
3838
pub involves_placeholder: bool,
3939
}
4040

41-
pub fn add_placeholder_note(err: &mut errors::DiagnosticBuilder<'_>) {
41+
pub fn add_placeholder_note(err: &mut rustc_errors::DiagnosticBuilder<'_>) {
4242
err.note(&format!(
4343
"this behavior recently changed as a result of a bug fix; \
4444
see rust-lang/rust#56105 for details"

Diff for: ‎src/librustc/traits/error_reporting.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ use crate::ty::SubtypePredicate;
2121
use crate::ty::TypeckTables;
2222
use crate::ty::{self, AdtKind, DefIdTree, ToPolyTraitRef, ToPredicate, Ty, TyCtxt, TypeFoldable};
2323

24-
use errors::{pluralize, struct_span_err, Applicability, DiagnosticBuilder, Style};
2524
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
25+
use rustc_errors::{pluralize, struct_span_err, Applicability, DiagnosticBuilder, Style};
2626
use rustc_hir as hir;
2727
use rustc_hir::def_id::{DefId, LOCAL_CRATE};
2828
use rustc_hir::Node;

Diff for: ‎src/librustc/traits/on_unimplemented.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ use fmt_macros::{Parser, Piece, Position};
33
use crate::ty::{self, GenericParamDefKind, TyCtxt};
44
use crate::util::common::ErrorReported;
55

6-
use errors::struct_span_err;
76
use rustc_data_structures::fx::FxHashMap;
7+
use rustc_errors::struct_span_err;
88
use rustc_hir::def_id::DefId;
99
use rustc_span::symbol::{kw, sym, Symbol};
1010
use rustc_span::Span;

Diff for: ‎src/librustc/traits/query/dropck_outlives.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ pub struct DropckOutlivesResult<'tcx> {
7676
impl<'tcx> DropckOutlivesResult<'tcx> {
7777
pub fn report_overflows(&self, tcx: TyCtxt<'tcx>, span: Span, ty: Ty<'tcx>) {
7878
if let Some(overflow_ty) = self.overflows.iter().next() {
79-
errors::struct_span_err!(
79+
rustc_errors::struct_span_err!(
8080
tcx.sess,
8181
span,
8282
E0320,

Diff for: ‎src/librustc/traits/select.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ pub enum IntercrateAmbiguityCause {
102102
impl IntercrateAmbiguityCause {
103103
/// Emits notes when the overlap is caused by complex intercrate ambiguities.
104104
/// See #23980 for details.
105-
pub fn add_intercrate_ambiguity_hint(&self, err: &mut errors::DiagnosticBuilder<'_>) {
105+
pub fn add_intercrate_ambiguity_hint(&self, err: &mut rustc_errors::DiagnosticBuilder<'_>) {
106106
err.note(&self.intercrate_ambiguity_hint());
107107
}
108108

Diff for: ‎src/librustc/traits/specialize/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ use crate::traits::select::IntercrateAmbiguityCause;
1717
use crate::traits::{self, coherence, FutureCompatOverlapErrorKind, ObligationCause, TraitEngine};
1818
use crate::ty::subst::{InternalSubsts, Subst, SubstsRef};
1919
use crate::ty::{self, TyCtxt, TypeFoldable};
20-
use errors::struct_span_err;
2120
use rustc_data_structures::fx::FxHashSet;
21+
use rustc_errors::struct_span_err;
2222
use rustc_hir::def_id::DefId;
2323
use rustc_span::DUMMY_SP;
2424

Diff for: ‎src/librustc/traits/util.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use errors::DiagnosticBuilder;
1+
use rustc_errors::DiagnosticBuilder;
22
use rustc_span::Span;
33
use smallvec::SmallVec;
44

Diff for: ‎src/librustc/ty/context.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ use rustc_hir::{HirId, Node, TraitCandidate};
5151
use rustc_hir::{ItemKind, ItemLocalId, ItemLocalMap, ItemLocalSet};
5252

5353
use arena::SyncDroplessArena;
54-
use errors::DiagnosticBuilder;
5554
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
5655
use rustc_data_structures::profiling::SelfProfilerRef;
5756
use rustc_data_structures::sharded::ShardedHashMap;
5857
use rustc_data_structures::stable_hasher::{
5958
hash_stable_hashmap, HashStable, StableHasher, StableVec,
6059
};
6160
use rustc_data_structures::sync::{Lock, Lrc, WorkerLocal};
61+
use rustc_errors::DiagnosticBuilder;
6262
use rustc_index::vec::{Idx, IndexVec};
6363
use rustc_macros::HashStable;
6464
use rustc_session::node_id::NodeMap;
@@ -1613,10 +1613,10 @@ pub mod tls {
16131613

16141614
use crate::dep_graph::TaskDeps;
16151615
use crate::ty::query;
1616-
use errors::Diagnostic;
16171616
use rustc_data_structures::sync::{self, Lock, Lrc};
16181617
use rustc_data_structures::thin_vec::ThinVec;
16191618
use rustc_data_structures::OnDrop;
1619+
use rustc_errors::Diagnostic;
16201620
use std::mem;
16211621

16221622
#[cfg(not(parallel_compiler))]

Diff for: ‎src/librustc/ty/error.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
use crate::ty::{self, BoundRegion, Region, Ty, TyCtxt};
2+
use rustc_errors::{pluralize, Applicability, DiagnosticBuilder};
23
use rustc_hir as hir;
34
use rustc_hir::def_id::DefId;
4-
5-
use errors::{Applicability, DiagnosticBuilder};
65
use rustc_span::Span;
76
use rustc_target::spec::abi;
87
use syntax::ast;
9-
use syntax::errors::pluralize;
108

119
use std::borrow::Cow;
1210
use std::fmt;

Diff for: ‎src/librustc/ty/query/on_disk_cache.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ use crate::session::{CrateDisambiguator, Session};
77
use crate::ty::codec::{self as ty_codec, TyDecoder, TyEncoder};
88
use crate::ty::context::TyCtxt;
99
use crate::ty::{self, Ty};
10-
use errors::Diagnostic;
1110
use rustc_data_structures::fx::FxHashMap;
1211
use rustc_data_structures::sync::{HashMapExt, Lock, Lrc, Once};
1312
use rustc_data_structures::thin_vec::ThinVec;
13+
use rustc_errors::Diagnostic;
1414
use rustc_hir as hir;
1515
use rustc_hir::def_id::{CrateNum, DefId, DefIndex, LocalDefId, LOCAL_CRATE};
1616
use rustc_index::vec::{Idx, IndexVec};

Diff for: ‎src/librustc/ty/query/plumbing.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ use crate::ty::query::Query;
99
use crate::ty::tls;
1010
use crate::ty::{self, TyCtxt};
1111

12-
use errors::{struct_span_err, Diagnostic, DiagnosticBuilder, FatalError, Handler, Level};
1312
#[cfg(not(parallel_compiler))]
1413
use rustc_data_structures::cold_path;
1514
use rustc_data_structures::fx::{FxHashMap, FxHasher};
1615
use rustc_data_structures::sharded::Sharded;
1716
use rustc_data_structures::sync::{Lock, Lrc};
1817
use rustc_data_structures::thin_vec::ThinVec;
18+
use rustc_errors::{struct_span_err, Diagnostic, DiagnosticBuilder, FatalError, Handler, Level};
1919
use rustc_span::source_map::DUMMY_SP;
2020
use rustc_span::Span;
2121
use std::collections::hash_map::Entry;

0 commit comments

Comments
 (0)