Pick up changes to rustc data structures in nightly
diff --git a/tests/common/eq.rs b/tests/common/eq.rs
index 375c9c4..9e4553b 100644
--- a/tests/common/eq.rs
+++ b/tests/common/eq.rs
@@ -6,6 +6,7 @@
use std::mem;
use self::rustc_data_structures::sync::Lrc;
+use self::rustc_data_structures::thin_vec::ThinVec;
use self::rustc_target::abi::FloatTy;
use self::rustc_target::spec::abi::Abi;
use self::syntax::ast::{
@@ -29,7 +30,6 @@
use self::syntax::ptr::P;
use self::syntax::symbol::Symbol;
use self::syntax::tokenstream::{Delimited, ThinTokenStream, TokenStream, TokenTree};
-use self::syntax::util::ThinVec;
use self::syntax_pos::{Span, SyntaxContext, DUMMY_SP};
pub trait SpanlessEq {
diff --git a/tests/test_precedence.rs b/tests/test_precedence.rs
index f2ebabc..3856b76 100644
--- a/tests/test_precedence.rs
+++ b/tests/test_precedence.rs
@@ -24,6 +24,7 @@
#[macro_use]
extern crate quote;
extern crate rayon;
+extern crate rustc_data_structures;
extern crate syn;
extern crate syntax;
extern crate walkdir;
@@ -208,11 +209,11 @@
///
/// This method operates on libsyntax objects.
fn libsyntax_brackets(libsyntax_expr: P<ast::Expr>) -> Option<P<ast::Expr>> {
+ use rustc_data_structures::small_vec::OneVector;
+ use rustc_data_structures::thin_vec::ThinVec;
use syntax::ast::{Expr, ExprKind, Field, Mac, Pat, Stmt, StmtKind, Ty};
use syntax::ext::quote::rt::DUMMY_SP;
use syntax::fold::{self, Folder};
- use syntax::util::small_vector::SmallVector;
- use syntax::util::ThinVec;
struct BracketsFolder {
failed: bool,
@@ -260,7 +261,7 @@
ty
}
- fn fold_stmt(&mut self, stmt: Stmt) -> SmallVector<Stmt> {
+ fn fold_stmt(&mut self, stmt: Stmt) -> OneVector<Stmt> {
let node = match stmt.node {
// Don't wrap toplevel expressions in statements.
StmtKind::Expr(e) => StmtKind::Expr(e.map(|e| fold::noop_fold_expr(e, self))),
@@ -268,7 +269,7 @@
s => s,
};
- SmallVector::one(Stmt { node, ..stmt })
+ OneVector::one(Stmt { node, ..stmt })
}
fn fold_mac(&mut self, mac: Mac) -> Mac {