bump smallvec to 1.0

[rust.git] / src / libsyntax / tests.rs

diff --git a/src/libsyntax/tests.rs b/src/libsyntax/tests.rs
index fbcf368ccb7b8aaa92a9b11420704bba286bf6e6..e73c8b43bccbf4d9242db01d0af54466fdc04af1 100644 (file)
--- a/src/libsyntax/tests.rs
+++ b/src/libsyntax/tests.rs
@@ -1,4 +1,4 @@
-use crate::{ast, panictry};
+use crate::ast;
 use crate::parse::{PResult, source_file_to_stream};
 use crate::parse::new_parser_from_source_str;
 use crate::parse::parser::Parser;
@@ -28,7 +28,7 @@ fn string_to_parser(ps: &ParseSess, source_str: String) -> Parser<'_> {
     F: FnOnce(&mut Parser<'a>) -> PResult<'a, T>,
 {
     let mut p = string_to_parser(&ps, s);
-    let x = panictry!(f(&mut p));
+    let x = f(&mut p).unwrap();
     p.sess.span_diagnostic.abort_if_errors();
     x
 }
@@ -111,8 +111,8 @@ struct SpanLabel {
     label: &'static str,
 }
 
-struct Shared<T: Write> {
-    data: Arc<Mutex<T>>,
+crate struct Shared<T: Write> {
+    pub data: Arc<Mutex<T>>,
 }
 
 impl<T: Write> Write for Shared<T> {