From 3216c7656afbada6af3cbf77ef5236a7153f58e8 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Fri, 8 Feb 2019 00:56:05 +0900 Subject: Rename rustc_errors dependency in rust 2018 crates --- src/libsyntax_ext/Cargo.toml | 2 +- src/libsyntax_ext/asm.rs | 2 +- src/libsyntax_ext/assert.rs | 2 +- src/libsyntax_ext/cfg.rs | 2 +- src/libsyntax_ext/deriving/custom.rs | 2 +- src/libsyntax_ext/format.rs | 4 ++-- src/libsyntax_ext/global_asm.rs | 2 +- src/libsyntax_ext/lib.rs | 2 -- src/libsyntax_ext/proc_macro_decls.rs | 1 - src/libsyntax_ext/proc_macro_impl.rs | 2 +- src/libsyntax_ext/proc_macro_server.rs | 2 +- 11 files changed, 10 insertions(+), 13 deletions(-) (limited to 'src/libsyntax_ext') diff --git a/src/libsyntax_ext/Cargo.toml b/src/libsyntax_ext/Cargo.toml index c22b55b8c13..773f0948a8a 100644 --- a/src/libsyntax_ext/Cargo.toml +++ b/src/libsyntax_ext/Cargo.toml @@ -11,7 +11,7 @@ crate-type = ["dylib"] [dependencies] fmt_macros = { path = "../libfmt_macros" } -rustc_errors = { path = "../librustc_errors" } +errors = { path = "../librustc_errors", package = "rustc_errors" } syntax = { path = "../libsyntax" } syntax_pos = { path = "../libsyntax_pos" } rustc_data_structures = { path = "../librustc_data_structures" } diff --git a/src/libsyntax_ext/asm.rs b/src/libsyntax_ext/asm.rs index ebcdceea7c5..8edd0e1ae38 100644 --- a/src/libsyntax_ext/asm.rs +++ b/src/libsyntax_ext/asm.rs @@ -4,7 +4,7 @@ use State::*; use rustc_data_structures::thin_vec::ThinVec; -use crate::errors::DiagnosticBuilder; +use errors::DiagnosticBuilder; use syntax::ast; use syntax::ext::base::{self, *}; diff --git a/src/libsyntax_ext/assert.rs b/src/libsyntax_ext/assert.rs index 984ef26f5ab..d2c397e0ecc 100644 --- a/src/libsyntax_ext/assert.rs +++ b/src/libsyntax_ext/assert.rs @@ -1,4 +1,4 @@ -use crate::errors::DiagnosticBuilder; +use errors::DiagnosticBuilder; use syntax::ast::{self, *}; use syntax::source_map::Spanned; diff --git a/src/libsyntax_ext/cfg.rs b/src/libsyntax_ext/cfg.rs index e2104550878..090d730289d 100644 --- a/src/libsyntax_ext/cfg.rs +++ b/src/libsyntax_ext/cfg.rs @@ -2,7 +2,7 @@ /// a literal `true` or `false` based on whether the given cfg matches the /// current compilation environment. -use crate::errors::DiagnosticBuilder; +use errors::DiagnosticBuilder; use syntax::ast; use syntax::ext::base::{self, *}; diff --git a/src/libsyntax_ext/deriving/custom.rs b/src/libsyntax_ext/deriving/custom.rs index 7d9b8402cac..81fcdc4be2b 100644 --- a/src/libsyntax_ext/deriving/custom.rs +++ b/src/libsyntax_ext/deriving/custom.rs @@ -1,4 +1,4 @@ -use crate::errors::FatalError; +use errors::FatalError; use crate::proc_macro_impl::EXEC_STRATEGY; use crate::proc_macro_server; diff --git a/src/libsyntax_ext/format.rs b/src/libsyntax_ext/format.rs index 1b17fc0d040..a27630a714c 100644 --- a/src/libsyntax_ext/format.rs +++ b/src/libsyntax_ext/format.rs @@ -3,8 +3,8 @@ use Position::*; use fmt_macros as parse; -use crate::errors::DiagnosticBuilder; -use crate::errors::Applicability; +use errors::DiagnosticBuilder; +use errors::Applicability; use syntax::ast; use syntax::ext::base::{self, *}; diff --git a/src/libsyntax_ext/global_asm.rs b/src/libsyntax_ext/global_asm.rs index 14dbd930023..2baf530aeda 100644 --- a/src/libsyntax_ext/global_asm.rs +++ b/src/libsyntax_ext/global_asm.rs @@ -8,7 +8,7 @@ /// LLVM's `module asm "some assembly here"`. All of LLVM's caveats /// therefore apply. -use crate::errors::DiagnosticBuilder; +use errors::DiagnosticBuilder; use syntax::ast; use syntax::source_map::respan; diff --git a/src/libsyntax_ext/lib.rs b/src/libsyntax_ext/lib.rs index 05c8084a51e..69f9e2c5eb0 100644 --- a/src/libsyntax_ext/lib.rs +++ b/src/libsyntax_ext/lib.rs @@ -17,8 +17,6 @@ extern crate proc_macro; -use rustc_errors as errors; - mod diagnostics; mod asm; diff --git a/src/libsyntax_ext/proc_macro_decls.rs b/src/libsyntax_ext/proc_macro_decls.rs index 5730081ce01..d8f8decef39 100644 --- a/src/libsyntax_ext/proc_macro_decls.rs +++ b/src/libsyntax_ext/proc_macro_decls.rs @@ -1,7 +1,6 @@ use std::mem; use crate::deriving; -use crate::errors; use syntax::ast::{self, Ident}; use syntax::attr; diff --git a/src/libsyntax_ext/proc_macro_impl.rs b/src/libsyntax_ext/proc_macro_impl.rs index 88e20e3dc7c..03290df0c72 100644 --- a/src/libsyntax_ext/proc_macro_impl.rs +++ b/src/libsyntax_ext/proc_macro_impl.rs @@ -1,4 +1,4 @@ -use crate::errors::FatalError; +use errors::FatalError; use crate::proc_macro_server; use syntax::source_map::Span; diff --git a/src/libsyntax_ext/proc_macro_server.rs b/src/libsyntax_ext/proc_macro_server.rs index 2158cfc089b..fd82dac5ab6 100644 --- a/src/libsyntax_ext/proc_macro_server.rs +++ b/src/libsyntax_ext/proc_macro_server.rs @@ -1,4 +1,4 @@ -use crate::errors::{self, Diagnostic, DiagnosticBuilder}; +use errors::{Diagnostic, DiagnosticBuilder}; use std::panic; -- cgit 1.4.1-3-g733a5 From c360ba285c5a74ce659811a0c72fb7bf32ec0b85 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Sat, 9 Feb 2019 11:24:02 +0900 Subject: Cleanup imports --- src/librustc/hir/lowering.rs | 10 +++++----- src/librustc/hir/mod.rs | 2 +- src/librustc/infer/error_reporting/mod.rs | 6 +++--- src/librustc/infer/mod.rs | 19 ++++++++++--------- src/librustc/lint/builtin.rs | 2 +- src/librustc/lint/levels.rs | 6 +++--- src/librustc/lint/mod.rs | 8 ++++---- src/librustc/middle/lib_features.rs | 2 +- src/librustc/middle/liveness.rs | 2 +- src/librustc/middle/resolve_lifetime.rs | 6 +++--- src/librustc/traits/error_reporting.rs | 6 +++--- src/librustc/ty/context.rs | 2 +- src/librustc/ty/query/mod.rs | 4 ++-- src/librustc/ty/query/on_disk_cache.rs | 19 ++++++++++--------- src/librustc/ty/query/plumbing.rs | 8 ++++---- src/libsyntax/attr/builtin.rs | 2 +- src/libsyntax/config.rs | 2 +- src/libsyntax/ext/base.rs | 2 +- src/libsyntax/ext/expand.rs | 2 +- src/libsyntax/ext/tt/macro_parser.rs | 4 ++-- src/libsyntax/ext/tt/macro_rules.rs | 2 +- src/libsyntax/feature_gate.rs | 2 +- src/libsyntax/json.rs | 3 ++- src/libsyntax/parse/lexer/mod.rs | 4 ++-- src/libsyntax/parse/mod.rs | 2 +- src/libsyntax/parse/parser.rs | 4 ++-- src/libsyntax/test.rs | 3 +-- src/libsyntax/test_snippet.rs | 3 ++- src/libsyntax_ext/deriving/custom.rs | 2 +- src/libsyntax_ext/proc_macro_impl.rs | 2 +- 30 files changed, 72 insertions(+), 69 deletions(-) (limited to 'src/libsyntax_ext') diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs index 1a825c44add..bdf781761cc 100644 --- a/src/librustc/hir/lowering.rs +++ b/src/librustc/hir/lowering.rs @@ -31,7 +31,6 @@ //! in the HIR, especially for multiple identifiers. use crate::dep_graph::DepGraph; -use errors::Applicability; use crate::hir::{self, ParamName}; use crate::hir::HirVec; use crate::hir::map::{DefKey, DefPathData, Definitions}; @@ -41,14 +40,15 @@ use crate::hir::GenericArg; use crate::lint::builtin::{self, PARENTHESIZED_PARAMS_IN_TYPES_AND_MODULES, ELIDED_LIFETIMES_IN_PATHS}; use crate::middle::cstore::CrateStore; -use rustc_data_structures::fx::FxHashSet; -use rustc_data_structures::indexed_vec::IndexVec; -use rustc_data_structures::thin_vec::ThinVec; -use rustc_data_structures::sync::Lrc; use crate::session::Session; use crate::session::config::nightly_options; use crate::util::common::FN_OUTPUT_NAME; use crate::util::nodemap::{DefIdMap, NodeMap}; +use errors::Applicability; +use rustc_data_structures::fx::FxHashSet; +use rustc_data_structures::indexed_vec::IndexVec; +use rustc_data_structures::thin_vec::ThinVec; +use rustc_data_structures::sync::Lrc; use std::collections::{BTreeSet, BTreeMap}; use std::fmt::Debug; diff --git a/src/librustc/hir/mod.rs b/src/librustc/hir/mod.rs index e454a4502d4..7238551d22e 100644 --- a/src/librustc/hir/mod.rs +++ b/src/librustc/hir/mod.rs @@ -10,12 +10,12 @@ pub use self::PrimTy::*; pub use self::UnOp::*; pub use self::UnsafeSource::*; -use errors::FatalError; use crate::hir::def::Def; use crate::hir::def_id::{DefId, DefIndex, LocalDefId, CRATE_DEF_INDEX}; use crate::util::nodemap::{NodeMap, FxHashSet}; use crate::mir::mono::Linkage; +use errors::FatalError; use syntax_pos::{Span, DUMMY_SP, symbol::InternedString}; use syntax::source_map::Spanned; use rustc_target::spec::abi::Abi; diff --git a/src/librustc/infer/error_reporting/mod.rs b/src/librustc/infer/error_reporting/mod.rs index f408cc9e3e4..93c02464749 100644 --- a/src/librustc/infer/error_reporting/mod.rs +++ b/src/librustc/infer/error_reporting/mod.rs @@ -50,16 +50,16 @@ use super::region_constraints::GenericKind; use super::{InferCtxt, RegionVariableOrigin, SubregionOrigin, TypeTrace, ValuePairs}; use crate::infer::{self, SuppressRegionErrors}; -use errors::{Applicability, DiagnosticBuilder, DiagnosticStyledString}; use crate::hir; use crate::hir::def_id::DefId; use crate::hir::Node; use crate::middle::region; -use std::{cmp, fmt}; -use syntax_pos::{Pos, Span}; use crate::traits::{ObligationCause, ObligationCauseCode}; use crate::ty::error::TypeError; use crate::ty::{self, subst::Subst, Region, Ty, TyCtxt, TyKind, TypeFoldable}; +use errors::{Applicability, DiagnosticBuilder, DiagnosticStyledString}; +use std::{cmp, fmt}; +use syntax_pos::{Pos, Span}; mod note; diff --git a/src/librustc/infer/mod.rs b/src/librustc/infer/mod.rs index 706aae88d15..3b822e01a42 100644 --- a/src/librustc/infer/mod.rs +++ b/src/librustc/infer/mod.rs @@ -7,21 +7,12 @@ pub use self::SubregionOrigin::*; pub use self::ValuePairs::*; pub use crate::ty::IntVarValue; -use arena::SyncDroplessArena; -use errors::DiagnosticBuilder; use crate::hir::def_id::DefId; use crate::infer::canonical::{Canonical, CanonicalVarValues}; use crate::middle::free_region::RegionRelations; use crate::middle::lang_items; use crate::middle::region; -use rustc_data_structures::unify as ut; use crate::session::config::BorrowckMode; -use std::cell::{Cell, Ref, RefCell, RefMut}; -use std::collections::BTreeMap; -use std::fmt; -use syntax::ast; -use syntax_pos::symbol::InternedString; -use syntax_pos::{self, Span}; use crate::traits::{self, ObligationCause, PredicateObligations, TraitEngine}; use crate::ty::error::{ExpectedFound, TypeError, UnconstrainedNumeric}; use crate::ty::fold::TypeFoldable; @@ -31,6 +22,16 @@ use crate::ty::{self, GenericParamDefKind, Ty, TyCtxt, CtxtInterners}; use crate::ty::{FloatVid, IntVid, TyVid}; use crate::util::nodemap::FxHashMap; +use arena::SyncDroplessArena; +use errors::DiagnosticBuilder; +use rustc_data_structures::unify as ut; +use std::cell::{Cell, Ref, RefCell, RefMut}; +use std::collections::BTreeMap; +use std::fmt; +use syntax::ast; +use syntax_pos::symbol::InternedString; +use syntax_pos::Span; + use self::combine::CombineFields; use self::lexical_region_resolve::LexicalRegionResolutions; use self::outlives::env::OutlivesEnvironment; diff --git a/src/librustc/lint/builtin.rs b/src/librustc/lint/builtin.rs index e6546617e2d..6f10b0e2c0e 100644 --- a/src/librustc/lint/builtin.rs +++ b/src/librustc/lint/builtin.rs @@ -4,9 +4,9 @@ //! compiler code, rather than using their own custom pass. Those //! lints are all available in `rustc_lint::builtin`. -use errors::{Applicability, DiagnosticBuilder}; use crate::lint::{LintPass, LateLintPass, LintArray}; use crate::session::Session; +use errors::{Applicability, DiagnosticBuilder}; use syntax::ast; use syntax::source_map::Span; diff --git a/src/librustc/lint/levels.rs b/src/librustc/lint/levels.rs index 5d2da649868..924aa3fde0a 100644 --- a/src/librustc/lint/levels.rs +++ b/src/librustc/lint/levels.rs @@ -1,20 +1,20 @@ use std::cmp; -use errors::{Applicability, DiagnosticBuilder}; use crate::hir::HirId; use crate::ich::StableHashingContext; use crate::lint::builtin; use crate::lint::context::CheckLintNameResult; use crate::lint::{self, Lint, LintId, Level, LintSource}; +use crate::session::Session; +use crate::util::nodemap::FxHashMap; +use errors::{Applicability, DiagnosticBuilder}; use rustc_data_structures::stable_hasher::{HashStable, ToStableHashKey, StableHasher, StableHasherResult}; -use crate::session::Session; use syntax::ast; use syntax::attr; use syntax::feature_gate; use syntax::source_map::MultiSpan; use syntax::symbol::Symbol; -use crate::util::nodemap::FxHashMap; pub struct LintLevelSets { list: Vec, diff --git a/src/librustc/lint/mod.rs b/src/librustc/lint/mod.rs index 7913afe1a4b..479f93b19bc 100644 --- a/src/librustc/lint/mod.rs +++ b/src/librustc/lint/mod.rs @@ -23,13 +23,16 @@ pub use self::LintSource::*; use rustc_data_structures::sync::{self, Lrc}; -use errors::{DiagnosticBuilder, DiagnosticId}; use crate::hir::def_id::{CrateNum, LOCAL_CRATE}; use crate::hir::intravisit; use crate::hir; use crate::lint::builtin::{BuiltinLintDiagnostics, DUPLICATE_MATCHER_BINDING_NAME}; use crate::lint::builtin::parser::{QUESTION_MARK_MACRO_SEP, ILL_FORMED_ATTRIBUTE_INPUT}; use crate::session::{Session, DiagnosticMessageId}; +use crate::ty::TyCtxt; +use crate::ty::query::Providers; +use crate::util::nodemap::NodeMap; +use errors::{DiagnosticBuilder, DiagnosticId}; use std::{hash, ptr}; use syntax::ast; use syntax::source_map::{MultiSpan, ExpnFormat}; @@ -37,9 +40,6 @@ use syntax::early_buffered_lints::BufferedEarlyLintId; use syntax::edition::Edition; use syntax::symbol::Symbol; use syntax_pos::Span; -use crate::ty::TyCtxt; -use crate::ty::query::Providers; -use crate::util::nodemap::NodeMap; pub use crate::lint::context::{LateContext, EarlyContext, LintContext, LintStore, check_crate, check_ast_crate, CheckLintNameResult, diff --git a/src/librustc/middle/lib_features.rs b/src/librustc/middle/lib_features.rs index c56c98ac008..331343e052d 100644 --- a/src/librustc/middle/lib_features.rs +++ b/src/librustc/middle/lib_features.rs @@ -5,10 +5,10 @@ // (unlike lang features), which means we need to collect them instead. use crate::ty::TyCtxt; +use crate::hir::intravisit::{self, NestedVisitorMap, Visitor}; use syntax::symbol::Symbol; use syntax::ast::{Attribute, MetaItem, MetaItemKind}; use syntax_pos::Span; -use crate::hir::intravisit::{self, NestedVisitorMap, Visitor}; use rustc_data_structures::fx::{FxHashSet, FxHashMap}; use errors::DiagnosticId; diff --git a/src/librustc/middle/liveness.rs b/src/librustc/middle/liveness.rs index 68f62bd96c2..6ff364e37d5 100644 --- a/src/librustc/middle/liveness.rs +++ b/src/librustc/middle/liveness.rs @@ -102,9 +102,9 @@ use crate::hir::Node; use crate::ty::{self, TyCtxt}; use crate::ty::query::Providers; use crate::lint; -use errors::Applicability; use crate::util::nodemap::{NodeMap, HirIdMap, HirIdSet}; +use errors::Applicability; use std::collections::{BTreeMap, VecDeque}; use std::{fmt, u32}; use std::io::prelude::*; diff --git a/src/librustc/middle/resolve_lifetime.rs b/src/librustc/middle/resolve_lifetime.rs index 0e56c1664ad..1a2f72cfa02 100644 --- a/src/librustc/middle/resolve_lifetime.rs +++ b/src/librustc/middle/resolve_lifetime.rs @@ -11,10 +11,11 @@ use crate::hir::map::Map; use crate::hir::{GenericArg, GenericParam, ItemLocalId, LifetimeName, Node, ParamName}; use crate::ty::{self, DefIdTree, GenericParamDefKind, TyCtxt}; -use errors::{Applicability, DiagnosticBuilder}; use crate::rustc::lint; -use rustc_data_structures::sync::Lrc; use crate::session::Session; +use crate::util::nodemap::{DefIdMap, FxHashMap, FxHashSet, NodeMap, NodeSet}; +use errors::{Applicability, DiagnosticBuilder}; +use rustc_data_structures::sync::Lrc; use std::borrow::Cow; use std::cell::Cell; use std::mem::replace; @@ -23,7 +24,6 @@ use syntax::attr; use syntax::ptr::P; use syntax::symbol::keywords; use syntax_pos::Span; -use crate::util::nodemap::{DefIdMap, FxHashMap, FxHashSet, NodeMap, NodeSet}; use crate::hir::intravisit::{self, NestedVisitorMap, Visitor}; use crate::hir::{self, GenericParamKind, LifetimeParamKind}; diff --git a/src/librustc/traits/error_reporting.rs b/src/librustc/traits/error_reporting.rs index 600311e6c34..55cb6e9baec 100644 --- a/src/librustc/traits/error_reporting.rs +++ b/src/librustc/traits/error_reporting.rs @@ -17,14 +17,11 @@ use super::{ Overflow, }; -use errors::{Applicability, DiagnosticBuilder}; use crate::hir; use crate::hir::Node; use crate::hir::def_id::DefId; use crate::infer::{self, InferCtxt}; use crate::infer::type_variable::TypeVariableOrigin; -use std::fmt; -use syntax::ast; use crate::session::DiagnosticMessageId; use crate::ty::{self, AdtKind, ToPredicate, ToPolyTraitRef, Ty, TyCtxt, TypeFoldable}; use crate::ty::GenericParamDefKind; @@ -35,6 +32,9 @@ use crate::ty::subst::Subst; use crate::ty::SubtypePredicate; use crate::util::nodemap::{FxHashMap, FxHashSet}; +use errors::{Applicability, DiagnosticBuilder}; +use std::fmt; +use syntax::ast; use syntax_pos::{DUMMY_SP, Span, ExpnInfo, ExpnFormat}; impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> { diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs index 0010eb98c6b..17b607328cc 100644 --- a/src/librustc/ty/context.rs +++ b/src/librustc/ty/context.rs @@ -2,7 +2,6 @@ use crate::dep_graph::DepGraph; use crate::dep_graph::{self, DepNode, DepConstructor}; -use errors::DiagnosticBuilder; use crate::session::Session; use crate::session::config::{BorrowckMode, OutputFilenames}; use crate::session::config::CrateType; @@ -43,6 +42,7 @@ use crate::ty::{BoundVar, BindingMode}; use crate::ty::CanonicalPolyFnSig; use crate::util::nodemap::{DefIdMap, DefIdSet, ItemLocalMap}; use crate::util::nodemap::{FxHashMap, FxHashSet}; +use errors::DiagnosticBuilder; use rustc_data_structures::interner::HashInterner; use smallvec::SmallVec; use rustc_data_structures::stable_hasher::{HashStable, hash_stable_hashmap, diff --git a/src/librustc/ty/query/mod.rs b/src/librustc/ty/query/mod.rs index cc43dbd779e..6aa810dcb2f 100644 --- a/src/librustc/ty/query/mod.rs +++ b/src/librustc/ty/query/mod.rs @@ -1,9 +1,7 @@ use crate::dep_graph::{self, DepConstructor, DepNode}; -use errors::DiagnosticBuilder; use crate::hir::def_id::{CrateNum, DefId, DefIndex}; use crate::hir::def::{Def, Export}; use crate::hir::{self, TraitCandidate, ItemLocalId, CodegenFnAttrs}; -use rustc_data_structures::svh::Svh; use crate::infer::canonical::{self, Canonical}; use crate::lint; use crate::middle::borrowck::BorrowCheckResult; @@ -44,6 +42,8 @@ use crate::util::common::{ErrorReported}; use crate::util::profiling::ProfileCategory::*; use crate::session::Session; +use errors::DiagnosticBuilder; +use rustc_data_structures::svh::Svh; use rustc_data_structures::bit_set::BitSet; use rustc_data_structures::indexed_vec::IndexVec; use rustc_data_structures::fx::{FxHashMap, FxHashSet}; diff --git a/src/librustc/ty/query/on_disk_cache.rs b/src/librustc/ty/query/on_disk_cache.rs index 8b6e1aae74f..8656c21ce10 100644 --- a/src/librustc/ty/query/on_disk_cache.rs +++ b/src/librustc/ty/query/on_disk_cache.rs @@ -1,28 +1,29 @@ use crate::dep_graph::{DepNodeIndex, SerializedDepNodeIndex}; -use errors::Diagnostic; use crate::hir; use crate::hir::def_id::{CrateNum, DefIndex, DefId, LocalDefId, LOCAL_CRATE}; use crate::hir::map::definitions::DefPathHash; use crate::ich::{CachingSourceMapView, Fingerprint}; use crate::mir::{self, interpret}; use crate::mir::interpret::{AllocDecodingSession, AllocDecodingState}; -use rustc_data_structures::fx::FxHashMap; -use rustc_data_structures::thin_vec::ThinVec; -use rustc_data_structures::sync::{Lrc, Lock, HashMapExt, Once}; -use rustc_data_structures::indexed_vec::{IndexVec, Idx}; use crate::rustc_serialize::{Decodable, Decoder, Encodable, Encoder, opaque, SpecializedDecoder, SpecializedEncoder, UseSpecializedDecodable, UseSpecializedEncodable}; use crate::session::{CrateDisambiguator, Session}; +use crate::ty; +use crate::ty::codec::{self as ty_codec, TyDecoder, TyEncoder}; +use crate::ty::context::TyCtxt; +use crate::util::common::time; + +use errors::Diagnostic; +use rustc_data_structures::fx::FxHashMap; +use rustc_data_structures::thin_vec::ThinVec; +use rustc_data_structures::sync::{Lrc, Lock, HashMapExt, Once}; +use rustc_data_structures::indexed_vec::{IndexVec, Idx}; use std::mem; use syntax::ast::NodeId; use syntax::source_map::{SourceMap, StableSourceFileId}; use syntax_pos::{BytePos, Span, DUMMY_SP, SourceFile}; use syntax_pos::hygiene::{Mark, SyntaxContext, ExpnInfo}; -use crate::ty; -use crate::ty::codec::{self as ty_codec, TyDecoder, TyEncoder}; -use crate::ty::context::TyCtxt; -use crate::util::common::time; const TAG_FILE_FOOTER: u128 = 0xC0FFEE_C0FFEE_C0FFEE_C0FFEE_C0FFEE; diff --git a/src/librustc/ty/query/plumbing.rs b/src/librustc/ty/query/plumbing.rs index 6b1fa359037..49c6093fb7d 100644 --- a/src/librustc/ty/query/plumbing.rs +++ b/src/librustc/ty/query/plumbing.rs @@ -3,10 +3,6 @@ //! provider, manage the caches, and so forth. use crate::dep_graph::{DepNodeIndex, DepNode, DepKind, SerializedDepNodeIndex}; -use errors::DiagnosticBuilder; -use errors::Level; -use errors::Diagnostic; -use errors::FatalError; use crate::ty::tls; use crate::ty::{TyCtxt}; use crate::ty::query::Query; @@ -16,6 +12,10 @@ use crate::ty::item_path; use crate::util::common::{profq_msg, ProfileQueriesMsg, QueryMsg}; +use errors::DiagnosticBuilder; +use errors::Level; +use errors::Diagnostic; +use errors::FatalError; use rustc_data_structures::fx::{FxHashMap}; use rustc_data_structures::sync::{Lrc, Lock}; use rustc_data_structures::thin_vec::ThinVec; diff --git a/src/libsyntax/attr/builtin.rs b/src/libsyntax/attr/builtin.rs index bb44706c1e3..7afe84d11dc 100644 --- a/src/libsyntax/attr/builtin.rs +++ b/src/libsyntax/attr/builtin.rs @@ -1,10 +1,10 @@ //! Parsing and validation of builtin attributes use crate::ast::{self, Attribute, MetaItem, Name, NestedMetaItemKind}; -use errors::{Applicability, Handler}; use crate::feature_gate::{Features, GatedCfg}; use crate::parse::ParseSess; +use errors::{Applicability, Handler}; use syntax_pos::{symbol::Symbol, Span}; use super::{list_contains_name, mark_used, MetaItemKind}; diff --git a/src/libsyntax/config.rs b/src/libsyntax/config.rs index 9565d02a9c2..66e9fa042df 100644 --- a/src/libsyntax/config.rs +++ b/src/libsyntax/config.rs @@ -9,12 +9,12 @@ use crate::feature_gate::{ use crate::attr; use crate::ast; use crate::edition::Edition; -use errors::Applicability; use crate::mut_visit::*; use crate::parse::{token, ParseSess}; use crate::ptr::P; use crate::util::map_in_place::MapInPlace; +use errors::Applicability; use smallvec::SmallVec; /// A folder that strips out items that do not belong in the current configuration. diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index 5c0f391d271..12caf8e23de 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -4,7 +4,6 @@ use crate::ast::{self, Attribute, Name, PatKind, MetaItem}; use crate::attr::HasAttrs; use crate::source_map::{SourceMap, Spanned, respan}; use crate::edition::Edition; -use errors::{DiagnosticBuilder, DiagnosticId}; use crate::ext::expand::{self, AstFragment, Invocation}; use crate::ext::hygiene::{self, Mark, SyntaxContext, Transparency}; use crate::mut_visit::{self, MutVisitor}; @@ -15,6 +14,7 @@ use crate::symbol::{keywords, Ident, Symbol}; use crate::ThinVec; use crate::tokenstream::{self, TokenStream}; +use errors::{DiagnosticBuilder, DiagnosticId}; use smallvec::{smallvec, SmallVec}; use syntax_pos::{Span, MultiSpan, DUMMY_SP}; diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index c007377add0..359db732515 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -3,7 +3,6 @@ use crate::ast::{MacStmtStyle, StmtKind, ItemKind}; use crate::attr::{self, HasAttrs}; use crate::source_map::{ExpnInfo, MacroBang, MacroAttribute, dummy_spanned, respan}; use crate::config::StripUnconfigured; -use errors::{Applicability, FatalError}; use crate::ext::base::*; use crate::ext::derive::{add_derived_markers, collect_derives}; use crate::ext::hygiene::{self, Mark, SyntaxContext}; @@ -20,6 +19,7 @@ use crate::tokenstream::{TokenStream, TokenTree}; use crate::visit::{self, Visitor}; use crate::util::map_in_place::MapInPlace; +use errors::{Applicability, FatalError}; use smallvec::{smallvec, SmallVec}; use syntax_pos::{Span, DUMMY_SP, FileName}; use syntax_pos::hygiene::ExpnFormat; diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index b69a3b428bb..fe9b5a068c4 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -75,7 +75,6 @@ pub use ParseResult::*; use TokenTreeOrTokenTreeSlice::*; use crate::ast::Ident; -use errors::FatalError; use crate::ext::tt::quoted::{self, TokenTree}; use crate::parse::{Directory, ParseSess}; use crate::parse::parser::{Parser, PathStyle}; @@ -84,8 +83,9 @@ use crate::print::pprust; use crate::symbol::keywords; use crate::tokenstream::{DelimSpan, TokenStream}; +use errors::FatalError; use smallvec::{smallvec, SmallVec}; -use syntax_pos::{self, Span}; +use syntax_pos::Span; use rustc_data_structures::fx::FxHashMap; use std::collections::hash_map::Entry::{Occupied, Vacant}; diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs index a3bdb3ba228..6f5a4eabb02 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.rs @@ -1,6 +1,5 @@ use crate::{ast, attr}; use crate::edition::Edition; -use errors::FatalError; use crate::ext::base::{DummyResult, ExtCtxt, MacResult, SyntaxExtension}; use crate::ext::base::{NormalTT, TTMacroExpander}; use crate::ext::expand::{AstFragment, AstFragmentKind}; @@ -17,6 +16,7 @@ use crate::parse::token::Token::*; use crate::symbol::Symbol; use crate::tokenstream::{DelimSpan, TokenStream, TokenTree}; +use errors::FatalError; use syntax_pos::{Span, DUMMY_SP, symbol::Ident}; use log::debug; diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 8f1188d2aaa..14183a496a9 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -20,11 +20,11 @@ use crate::attr; use crate::early_buffered_lints::BufferedEarlyLintId; use crate::source_map::Spanned; use crate::edition::{ALL_EDITIONS, Edition}; -use errors::{DiagnosticBuilder, Handler}; use crate::visit::{self, FnKind, Visitor}; use crate::parse::ParseSess; use crate::symbol::Symbol; +use errors::{DiagnosticBuilder, Handler}; use rustc_data_structures::fx::FxHashMap; use rustc_target::spec::abi::Abi; use syntax_pos::{Span, DUMMY_SP}; diff --git a/src/libsyntax/json.rs b/src/libsyntax/json.rs index 94b25111d9d..09f77fd33db 100644 --- a/src/libsyntax/json.rs +++ b/src/libsyntax/json.rs @@ -10,12 +10,13 @@ // FIXME: spec the JSON output properly. use crate::source_map::{SourceMap, FilePathMapping}; + use errors::registry::Registry; use errors::{DiagnosticBuilder, SubDiagnostic, CodeSuggestion, SourceMapper}; use errors::{DiagnosticId, Applicability}; use errors::emitter::{Emitter, EmitterWriter}; -use syntax_pos::{self, MacroBacktrace, Span, SpanLabel, MultiSpan}; +use syntax_pos::{MacroBacktrace, Span, SpanLabel, MultiSpan}; use rustc_data_structures::sync::{self, Lrc}; use std::io::{self, Write}; use std::vec; diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs index 1634cbfc156..7a164018289 100644 --- a/src/libsyntax/parse/lexer/mod.rs +++ b/src/libsyntax/parse/lexer/mod.rs @@ -1,10 +1,10 @@ use crate::ast::{self, Ident}; use crate::source_map::{SourceMap, FilePathMapping}; -use errors::{Applicability, FatalError, Diagnostic, DiagnosticBuilder}; use crate::parse::{token, ParseSess}; use crate::symbol::{Symbol, keywords}; -use syntax_pos::{self, BytePos, CharPos, Pos, Span, NO_EXPANSION}; +use errors::{Applicability, FatalError, Diagnostic, DiagnosticBuilder}; +use syntax_pos::{BytePos, CharPos, Pos, Span, NO_EXPANSION}; use core::unicode::property::Pattern_White_Space; use std::borrow::Cow; diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index 1ac3d8ec781..87ca883ef7b 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -3,7 +3,6 @@ use crate::ast::{self, CrateConfig, NodeId}; use crate::early_buffered_lints::{BufferedEarlyLint, BufferedEarlyLintId}; use crate::source_map::{SourceMap, FilePathMapping}; -use errors::{FatalError, Level, Handler, ColorConfig, Diagnostic, DiagnosticBuilder}; use crate::feature_gate::UnstableFeatures; use crate::parse::parser::Parser; use crate::symbol::Symbol; @@ -11,6 +10,7 @@ use crate::tokenstream::{TokenStream, TokenTree}; use crate::diagnostics::plugin::ErrorMap; use crate::print::pprust::token_to_string; +use errors::{FatalError, Level, Handler, ColorConfig, Diagnostic, DiagnosticBuilder}; use rustc_data_structures::sync::{Lrc, Lock}; use syntax_pos::{Span, SourceFile, FileName, MultiSpan}; use log::debug; diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 8db8c253bad..3eacd61c318 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -33,7 +33,6 @@ use crate::ast::{RangeEnd, RangeSyntax}; use crate::{ast, attr}; use crate::ext::base::DummyResult; use crate::source_map::{self, SourceMap, Spanned, respan}; -use errors::{Applicability, DiagnosticBuilder, DiagnosticId}; use crate::parse::{self, SeqSep, classify, token}; use crate::parse::lexer::{TokenAndSpan, UnmatchedBrace}; use crate::parse::lexer::comments::{doc_comment_style, strip_doc_comment_decoration}; @@ -47,8 +46,9 @@ use crate::ThinVec; use crate::tokenstream::{self, DelimSpan, TokenTree, TokenStream, TreeAndJoint}; use crate::symbol::{Symbol, keywords}; +use errors::{Applicability, DiagnosticBuilder, DiagnosticId}; use rustc_target::spec::abi::{self, Abi}; -use syntax_pos::{self, Span, MultiSpan, BytePos, FileName}; +use syntax_pos::{Span, MultiSpan, BytePos, FileName}; use log::{debug, trace}; use std::borrow::Cow; diff --git a/src/libsyntax/test.rs b/src/libsyntax/test.rs index 6506546b3b2..56290fa771b 100644 --- a/src/libsyntax/test.rs +++ b/src/libsyntax/test.rs @@ -12,11 +12,10 @@ use std::vec; use log::debug; use smallvec::{smallvec, SmallVec}; -use syntax_pos::{self, DUMMY_SP, NO_EXPANSION, Span, SourceFile, BytePos}; +use syntax_pos::{DUMMY_SP, NO_EXPANSION, Span, SourceFile, BytePos}; use crate::attr::{self, HasAttrs}; use crate::source_map::{self, SourceMap, ExpnInfo, MacroAttribute, dummy_spanned, respan}; -use errors; use crate::config; use crate::entry::{self, EntryPointType}; use crate::ext::base::{ExtCtxt, Resolver}; diff --git a/src/libsyntax/test_snippet.rs b/src/libsyntax/test_snippet.rs index e9ea39b83d4..cf39090e188 100644 --- a/src/libsyntax/test_snippet.rs +++ b/src/libsyntax/test_snippet.rs @@ -1,7 +1,8 @@ use crate::source_map::{SourceMap, FilePathMapping}; +use crate::with_globals; + use errors::Handler; use errors::emitter::EmitterWriter; -use crate::with_globals; use std::io; use std::io::prelude::*; diff --git a/src/libsyntax_ext/deriving/custom.rs b/src/libsyntax_ext/deriving/custom.rs index 81fcdc4be2b..6aba4d83cd2 100644 --- a/src/libsyntax_ext/deriving/custom.rs +++ b/src/libsyntax_ext/deriving/custom.rs @@ -1,7 +1,7 @@ -use errors::FatalError; use crate::proc_macro_impl::EXEC_STRATEGY; use crate::proc_macro_server; +use errors::FatalError; use syntax::ast::{self, ItemKind, Attribute, Mac}; use syntax::attr::{mark_used, mark_known}; use syntax::source_map::Span; diff --git a/src/libsyntax_ext/proc_macro_impl.rs b/src/libsyntax_ext/proc_macro_impl.rs index 03290df0c72..f0fc6392cd7 100644 --- a/src/libsyntax_ext/proc_macro_impl.rs +++ b/src/libsyntax_ext/proc_macro_impl.rs @@ -1,6 +1,6 @@ -use errors::FatalError; use crate::proc_macro_server; +use errors::FatalError; use syntax::source_map::Span; use syntax::ext::base::{self, *}; use syntax::tokenstream::TokenStream; -- cgit 1.4.1-3-g733a5