Update tests to nightly-2018-08-23
diff --git a/tests/clone.sh b/tests/clone.sh
index 999e15e..48d9739 100755
--- a/tests/clone.sh
+++ b/tests/clone.sh
@@ -2,7 +2,7 @@
REMOTE=rust
REPO=https://github.com/rust-lang/rust
-REV=33b923fd44c5c5925e635815fce68bdf1f98740f
+REV=63d66494aff57411bfec1dd2a3a5f1af900feab6
set -euo pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"
diff --git a/tests/common/eq.rs b/tests/common/eq.rs
index 9e4553b..b229890 100644
--- a/tests/common/eq.rs
+++ b/tests/common/eq.rs
@@ -24,10 +24,10 @@
VisibilityKind, WhereBoundPredicate, WhereClause, WhereEqPredicate, WherePredicate,
WhereRegionPredicate,
};
-use self::syntax::codemap::Spanned;
use self::syntax::parse::lexer::comments;
use self::syntax::parse::token::{DelimToken, Lit, Token};
use self::syntax::ptr::P;
+use self::syntax::source_map::Spanned;
use self::syntax::symbol::Symbol;
use self::syntax::tokenstream::{Delimited, ThinTokenStream, TokenStream, TokenTree};
use self::syntax_pos::{Span, SyntaxContext, DUMMY_SP};
@@ -355,7 +355,7 @@
spanless_eq_enum!(ExprKind; Box(0) ObsoleteInPlace(0 1) Array(0) Call(0 1)
MethodCall(0 1) Tup(0) Binary(0 1 2) Unary(0 1) Lit(0) Cast(0 1) Type(0 1)
If(0 1 2) IfLet(0 1 2 3) While(0 1 2) WhileLet(0 1 2 3) ForLoop(0 1 2 3)
- Loop(0 1) Match(0 1) Closure(0 1 2 3 4 5) Block(0 1) Async(0 1 2) Catch(0)
+ Loop(0 1) Match(0 1) Closure(0 1 2 3 4 5) Block(0 1) Async(0 1 2) TryBlock(0)
Assign(0 1) AssignOp(0 1 2) Field(0 1) Index(0 1) Range(0 1 2) Path(0 1)
AddrOf(0 1) Break(0 1) Continue(0) Ret(0) InlineAsm(0) Mac(0) Struct(0 1 2)
Repeat(0 1) Paren(0) Try(0) Yield(0));
diff --git a/tests/common/parse.rs b/tests/common/parse.rs
index e5a6a94..0f410e6 100644
--- a/tests/common/parse.rs
+++ b/tests/common/parse.rs
@@ -12,9 +12,9 @@
extern crate syntax_pos;
use self::syntax::ast;
-use self::syntax::codemap::FilePathMapping;
use self::syntax::parse::{self, ParseSess};
use self::syntax::ptr::P;
+use self::syntax::source_map::FilePathMapping;
use self::syntax_pos::edition::Edition;
use self::syntax_pos::{hygiene, FileName};
diff --git a/tests/test_precedence.rs b/tests/test_precedence.rs
index 2b67094..dd8edea 100644
--- a/tests/test_precedence.rs
+++ b/tests/test_precedence.rs
@@ -25,12 +25,14 @@
#[macro_use]
extern crate quote;
extern crate rayon;
+extern crate regex;
extern crate rustc_data_structures;
extern crate syn;
extern crate syntax;
extern crate walkdir;
use rayon::iter::{IntoParallelIterator, ParallelIterator};
+use regex::Regex;
use syntax::ast;
use syntax::ptr::P;
use walkdir::{DirEntry, WalkDir};
@@ -100,6 +102,9 @@
let passed = AtomicUsize::new(0);
let failed = AtomicUsize::new(0);
+ // 2018 edition is hard
+ let edition_regex = Regex::new(r"\b(async|try)[!(]").unwrap();
+
WalkDir::new("tests/rust")
.sort_by(|a, b| a.file_name().cmp(b.file_name()))
.into_iter()
@@ -125,6 +130,7 @@
let mut file = File::open(path).unwrap();
let mut content = String::new();
file.read_to_string(&mut content).unwrap();
+ let content = edition_regex.replace_all(&content, "_$0");
let (l_passed, l_failed) = match syn::parse_file(&content) {
Ok(file) => {
@@ -270,7 +276,7 @@
s => s,
};
- OneVector::one(Stmt { node, ..stmt })
+ OneVector::from_vec(vec![Stmt { node, ..stmt }])
}
fn fold_mac(&mut self, mac: Mac) -> Mac {
diff --git a/tests/test_round_trip.rs b/tests/test_round_trip.rs
index 3e993fb..87c1a04 100644
--- a/tests/test_round_trip.rs
+++ b/tests/test_round_trip.rs
@@ -20,8 +20,8 @@
use rayon::iter::{IntoParallelIterator, ParallelIterator};
use syntax::ast;
-use syntax::codemap::FilePathMapping;
use syntax::parse::{self, PResult, ParseSess};
+use syntax::source_map::FilePathMapping;
use syntax_pos::FileName;
use walkdir::{DirEntry, WalkDir};