Rollup merge of #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 #58099

r? @Centril
This commit is contained in:
Mazdak Farrokhzad
2019-02-13 04:37:04 +01:00
committed by GitHub
65 changed files with 114 additions and 121 deletions
+1 -1
View File
@@ -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" }
+1 -1
View File
@@ -4,7 +4,7 @@
use rustc_data_structures::thin_vec::ThinVec;
use crate::errors::DiagnosticBuilder;
use errors::DiagnosticBuilder;
use syntax::ast;
use syntax::ext::base::{self, *};
+1 -1
View File
@@ -1,4 +1,4 @@
use crate::errors::DiagnosticBuilder;
use errors::DiagnosticBuilder;
use syntax::ast::{self, *};
use syntax::source_map::Spanned;
+1 -1
View File
@@ -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, *};
+1 -1
View File
@@ -1,7 +1,7 @@
use crate::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;
+2 -2
View File
@@ -3,8 +3,8 @@
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, *};
+1 -1
View File
@@ -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;
-2
View File
@@ -16,8 +16,6 @@
extern crate proc_macro;
use rustc_errors as errors;
mod diagnostics;
mod asm;
-1
View File
@@ -1,7 +1,6 @@
use std::mem;
use crate::deriving;
use crate::errors;
use syntax::ast::{self, Ident};
use syntax::attr;
+1 -1
View File
@@ -1,6 +1,6 @@
use crate::errors::FatalError;
use crate::proc_macro_server;
use errors::FatalError;
use syntax::source_map::Span;
use syntax::ext::base::{self, *};
use syntax::tokenstream::TokenStream;
+1 -1
View File
@@ -1,4 +1,4 @@
use crate::errors::{self, Diagnostic, DiagnosticBuilder};
use errors::{Diagnostic, DiagnosticBuilder};
use std::panic;