Skip to content

OneVector type alias has been removed #504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dtolnay merged 1 commit into from
Sep 28, 2018
Merged

OneVector type alias has been removed #504

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions tests/test_precedence.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ extern crate quote;
extern crate rayon;
extern crate regex;
extern crate rustc_data_structures;
#[macro_use]
extern crate smallvec;
extern crate syn;
extern crate syntax;
extern crate walkdir;
Expand Down Expand Up @@ -215,8 +217,8 @@ fn libsyntax_parse_and_rewrite(input: &str) -> Option<P<ast::Expr>> {
///
/// 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 smallvec::SmallVec;
use syntax::ast::{Expr, ExprKind, Field, Mac, Pat, Stmt, StmtKind, Ty};
use syntax::ext::quote::rt::DUMMY_SP;
use syntax::fold::{self, Folder};
Expand Down Expand Up @@ -261,15 +263,15 @@ fn libsyntax_brackets(libsyntax_expr: P<ast::Expr>) -> Option<P<ast::Expr>> {
ty
}

fn fold_stmt(&mut self, stmt: Stmt) -> OneVector<Stmt> {
fn fold_stmt(&mut self, stmt: Stmt) -> SmallVec<[Stmt; 1]> {
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))),
StmtKind::Semi(e) => StmtKind::Semi(e.map(|e| fold::noop_fold_expr(e, self))),
s => s,
};

OneVector::from_vec(vec![Stmt { node, ..stmt }])
smallvec![Stmt { node, ..stmt }]
}

fn fold_mac(&mut self, mac: Mac) -> Mac {
Expand Down