about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJonathan Turner <jturner@mozilla.com>2016-06-24 19:10:15 -0400
committerJonathan Turner <jturner@mozilla.com>2016-06-24 19:10:15 -0400
commitbc1400600be083cfb39ffdc6f6b32153e585cd3c (patch)
tree27e265d6d0071a878d74d63e94938213c0c984b7
parent9f2a50785b2b01f58c08d3c23add09e2596dfd5a (diff)
downloadrust-bc1400600be083cfb39ffdc6f6b32153e585cd3c.tar.gz
rust-bc1400600be083cfb39ffdc6f6b32153e585cd3c.zip
reexport errors from syntax. fix failing cfail test
-rw-r--r--src/libsyntax/diagnostics/plugin.rs2
-rw-r--r--src/libsyntax/lib.rs3
-rw-r--r--src/test/compile-fail-fulldeps/qquote.rs2
3 files changed, 5 insertions, 2 deletions
diff --git a/src/libsyntax/diagnostics/plugin.rs b/src/libsyntax/diagnostics/plugin.rs
index f5bc01b4e22..abf2b39d5c6 100644
--- a/src/libsyntax/diagnostics/plugin.rs
+++ b/src/libsyntax/diagnostics/plugin.rs
@@ -23,6 +23,8 @@ use util::small_vector::SmallVector;
 
 use diagnostics::metadata::output_metadata;
 
+pub use errors::*;
+
 // Maximum width of any line in an extended error description (inclusive).
 const MAX_DESCRIPTION_WIDTH: usize = 80;
 
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index 91e55c07d9b..ae61801c65b 100644
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -40,11 +40,12 @@ extern crate libc;
 #[macro_use] extern crate log;
 #[macro_use] #[no_link] extern crate rustc_bitflags;
 extern crate rustc_unicode;
-extern crate rustc_errors as errors;
+pub extern crate rustc_errors as errors;
 extern crate syntax_pos;
 
 extern crate serialize as rustc_serialize; // used by deriving
 
+
 // A variant of 'try!' that panics on an Err. This is used as a crutch on the
 // way towards a non-panic!-prone parser. It should be used for fatal parsing
 // errors; eventually we plan to convert all code using panictry to just use
diff --git a/src/test/compile-fail-fulldeps/qquote.rs b/src/test/compile-fail-fulldeps/qquote.rs
index 9a193469615..e29ded8a052 100644
--- a/src/test/compile-fail-fulldeps/qquote.rs
+++ b/src/test/compile-fail-fulldeps/qquote.rs
@@ -18,7 +18,7 @@ extern crate syntax_pos;
 use syntax::ast;
 use syntax::parse;
 use syntax::print::pprust;
-use syntax_pos::{self, DUMMY_SP};
+use syntax_pos::DUMMY_SP;
 
 fn main() {
     let ps = syntax::parse::ParseSess::new();