Skip to content

Commit 55bc4f6

Browse files
authored
Rollup merge of rust-lang#58273 - taiki-e:rename-dependency, r=matthewjasper
Rename rustc_errors dependency in rust 2018 crates I think this is a better solution than `use rustc_errors as errors` in `lib.rs` and `use crate::errors` in modules. Related: rust-lang/cargo#5653 cc rust-lang#58099 r? @Centril
2 parents 414f7ec + c08b5ca commit 55bc4f6

Some content is hidden

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

65 files changed

+114
-121
lines changed

src/librustc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ rustc-rayon-core = "0.1.1"
2525
rustc_apfloat = { path = "../librustc_apfloat" }
2626
rustc_target = { path = "../librustc_target" }
2727
rustc_data_structures = { path = "../librustc_data_structures" }
28-
rustc_errors = { path = "../librustc_errors" }
28+
errors = { path = "../librustc_errors", package = "rustc_errors" }
2929
serialize = { path = "../libserialize" }
3030
syntax = { path = "../libsyntax" }
3131
syntax_pos = { path = "../libsyntax_pos" }

src/librustc/dep_graph/graph.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::errors::{Diagnostic, DiagnosticBuilder};
1+
use errors::{Diagnostic, DiagnosticBuilder};
22
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
33
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
44
use rustc_data_structures::indexed_vec::{Idx, IndexVec};

src/librustc/hir/lowering.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
//! in the HIR, especially for multiple identifiers.
3232
3333
use crate::dep_graph::DepGraph;
34-
use crate::errors::Applicability;
3534
use crate::hir::{self, ParamName};
3635
use crate::hir::HirVec;
3736
use crate::hir::map::{DefKey, DefPathData, Definitions};
@@ -41,14 +40,15 @@ use crate::hir::GenericArg;
4140
use crate::lint::builtin::{self, PARENTHESIZED_PARAMS_IN_TYPES_AND_MODULES,
4241
ELIDED_LIFETIMES_IN_PATHS};
4342
use crate::middle::cstore::CrateStore;
44-
use rustc_data_structures::fx::FxHashSet;
45-
use rustc_data_structures::indexed_vec::IndexVec;
46-
use rustc_data_structures::thin_vec::ThinVec;
47-
use rustc_data_structures::sync::Lrc;
4843
use crate::session::Session;
4944
use crate::session::config::nightly_options;
5045
use crate::util::common::FN_OUTPUT_NAME;
5146
use crate::util::nodemap::{DefIdMap, NodeMap};
47+
use errors::Applicability;
48+
use rustc_data_structures::fx::FxHashSet;
49+
use rustc_data_structures::indexed_vec::IndexVec;
50+
use rustc_data_structures::thin_vec::ThinVec;
51+
use rustc_data_structures::sync::Lrc;
5252

5353
use std::collections::{BTreeSet, BTreeMap};
5454
use std::fmt::Debug;

src/librustc/hir/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ pub use self::PrimTy::*;
1010
pub use self::UnOp::*;
1111
pub use self::UnsafeSource::*;
1212

13-
use crate::errors::FatalError;
1413
use crate::hir::def::Def;
1514
use crate::hir::def_id::{DefId, DefIndex, LocalDefId, CRATE_DEF_INDEX};
1615
use crate::util::nodemap::{NodeMap, FxHashSet};
1716
use crate::mir::mono::Linkage;
1817

18+
use errors::FatalError;
1919
use syntax_pos::{Span, DUMMY_SP, symbol::InternedString};
2020
use syntax::source_map::Spanned;
2121
use rustc_target::spec::abi::Abi;

src/librustc/infer/error_reporting/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,16 @@ use super::region_constraints::GenericKind;
5050
use super::{InferCtxt, RegionVariableOrigin, SubregionOrigin, TypeTrace, ValuePairs};
5151
use crate::infer::{self, SuppressRegionErrors};
5252

53-
use crate::errors::{Applicability, DiagnosticBuilder, DiagnosticStyledString};
5453
use crate::hir;
5554
use crate::hir::def_id::DefId;
5655
use crate::hir::Node;
5756
use crate::middle::region;
58-
use std::{cmp, fmt};
59-
use syntax_pos::{Pos, Span};
6057
use crate::traits::{ObligationCause, ObligationCauseCode};
6158
use crate::ty::error::TypeError;
6259
use crate::ty::{self, subst::Subst, Region, Ty, TyCtxt, TyKind, TypeFoldable};
60+
use errors::{Applicability, DiagnosticBuilder, DiagnosticStyledString};
61+
use std::{cmp, fmt};
62+
use syntax_pos::{Pos, Span};
6363

6464
mod note;
6565

src/librustc/infer/error_reporting/need_type_info.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::infer::type_variable::TypeVariableOrigin;
55
use crate::ty::{self, Ty, Infer, TyVar};
66
use syntax::source_map::CompilerDesugaringKind;
77
use syntax_pos::Span;
8-
use crate::errors::DiagnosticBuilder;
8+
use errors::DiagnosticBuilder;
99

1010
struct FindLocalByTypeVisitor<'a, 'gcx: 'a + 'tcx, 'tcx: 'a> {
1111
infcx: &'a InferCtxt<'a, 'gcx, 'tcx>,

src/librustc/infer/error_reporting/nice_region_error/named_anon_conflict.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use crate::infer::error_reporting::nice_region_error::NiceRegionError;
44
use crate::ty;
55
use crate::util::common::ErrorReported;
6-
use crate::errors::Applicability;
6+
use errors::Applicability;
77

88
impl<'a, 'gcx, 'tcx> NiceRegionError<'a, 'gcx, 'tcx> {
99
/// When given a `ConcreteFailure` for a function with arguments containing a named region and

src/librustc/infer/error_reporting/nice_region_error/placeholder_error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::errors::DiagnosticBuilder;
1+
use errors::DiagnosticBuilder;
22
use crate::hir::def_id::DefId;
33
use crate::infer::error_reporting::nice_region_error::NiceRegionError;
44
use crate::infer::lexical_region_resolve::RegionResolutionError;

src/librustc/infer/error_reporting/nice_region_error/static_impl_trait.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::infer::error_reporting::nice_region_error::NiceRegionError;
44
use crate::infer::lexical_region_resolve::RegionResolutionError;
55
use crate::ty::{BoundRegion, FreeRegion, RegionKind};
66
use crate::util::common::ErrorReported;
7-
use crate::errors::Applicability;
7+
use errors::Applicability;
88

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

src/librustc/infer/error_reporting/note.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::infer::{self, InferCtxt, SubregionOrigin};
22
use crate::middle::region;
33
use crate::ty::{self, Region};
44
use crate::ty::error::TypeError;
5-
use crate::errors::DiagnosticBuilder;
5+
use errors::DiagnosticBuilder;
66

77
impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
88
pub(super) fn note_region_origin(&self,

0 commit comments

Comments
 (0)