Update test suite to nightly-2020-01-05

dtolnay · Jan 5, 2020 · 4489ebe · 4489ebe
1 parent c6ba892
commit 4489ebe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/tests/common/eq.rs b/tests/common/eq.rs
@@ -7,7 +7,8 @@ use std::mem;
 
 use rustc_data_structures::sync::Lrc;
 use rustc_data_structures::thin_vec::ThinVec;
-use rustc_span::{Span, SyntaxContext, DUMMY_SP};
+use rustc_span::source_map::Spanned;
+use rustc_span::{sym, Span, Symbol, SyntaxContext, DUMMY_SP};
 use syntax::ast::{
     AngleBracketedArgs, AnonConst, Arm, AsmDialect, AssocItem, AssocItemKind, AssocTyConstraint,
     AssocTyConstraintKind, AttrId, AttrItem, AttrKind, AttrStyle, Attribute, BareFnTy, BinOpKind,
@@ -24,8 +25,6 @@ use syntax::ast::{
     WhereBoundPredicate, WhereClause, WhereEqPredicate, WherePredicate, WhereRegionPredicate,
 };
 use syntax::ptr::P;
-use syntax::source_map::Spanned;
-use syntax::symbol::{sym, Symbol};
 use syntax::token::{self, DelimToken, Token, TokenKind};
 use syntax::tokenstream::{DelimSpan, TokenStream, TokenTree};
 use syntax::util::comments;

diff --git a/tests/common/parse.rs b/tests/common/parse.rs
@@ -3,11 +3,11 @@ extern crate rustc_parse as parse;
 extern crate rustc_span;
 extern crate syntax;
 
+use rustc_span::source_map::FilePathMapping;
 use rustc_span::FileName;
 use syntax::ast;
 use syntax::ptr::P;
 use syntax::sess::ParseSess;
-use syntax::source_map::FilePathMapping;
 
 use std::panic;
 

diff --git a/tests/test_round_trip.rs b/tests/test_round_trip.rs
@@ -12,11 +12,11 @@ mod features;
 use quote::quote;
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
 use rustc_span::edition::Edition;
+use rustc_span::source_map::FilePathMapping;
 use rustc_span::FileName;
 use syntax::ast;
 use syntax::errors::PResult;
 use syntax::sess::ParseSess;
-use syntax::source_map::FilePathMapping;
 use walkdir::{DirEntry, WalkDir};
 
 use std::fs::File;