about summary refs log tree commit diff
path: root/src/libsyntax/lib.rs
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-02-13 04:37:04 +0100
committerGitHub <noreply@github.com>2019-02-13 04:37:04 +0100
commit0bc8f6f3f4ecfa3309aaa4df52fb4aa1ddd63b07 (patch)
tree9e9acdc1fafa0a30b951815b4c6ca3a3214077e0 /src/libsyntax/lib.rs
parentecb650316983697cca65b9b265692e4385a67d9c (diff)
parentc08b5ca4ad26250f6af17ba7e2938d9e694f2842 (diff)
downloadrust-0bc8f6f3f4ecfa3309aaa4df52fb4aa1ddd63b07.tar.gz
rust-0bc8f6f3f4ecfa3309aaa4df52fb4aa1ddd63b07.zip
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
Diffstat (limited to 'src/libsyntax/lib.rs')
-rw-r--r--src/libsyntax/lib.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index a56cdf623bf..36488b3a69f 100644
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -24,7 +24,7 @@
 #[allow(unused_extern_crates)]
 extern crate serialize as rustc_serialize; // used by deriving
 
-pub use rustc_errors as errors;
+pub use errors;
 use rustc_data_structures::sync::Lock;
 use rustc_data_structures::bit_set::GrowableBitSet;
 pub use rustc_data_structures::thin_vec::ThinVec;
@@ -37,7 +37,7 @@ use ast::AttrId;
 macro_rules! panictry {
     ($e:expr) => ({
         use std::result::Result::{Ok, Err};
-        use crate::errors::FatalError;
+        use errors::FatalError;
         match $e {
             Ok(e) => e,
             Err(mut e) => {
@@ -52,7 +52,7 @@ macro_rules! panictry {
 macro_rules! panictry_buffer {
     ($handler:expr, $e:expr) => ({
         use std::result::Result::{Ok, Err};
-        use crate::errors::{FatalError, DiagnosticBuilder};
+        use errors::{FatalError, DiagnosticBuilder};
         match $e {
             Ok(e) => e,
             Err(errs) => {