diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2018-08-14 11:26:28 -0700 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2018-08-14 11:26:28 -0700 |
| commit | bac76afb5a7885de19bfd9e6191fe8e2a29bd74d (patch) | |
| tree | af86be0f1b39c988a5c7cf141dcfea502fbdce43 | |
| parent | 84aa49935dfc6dc9ddd795d0372dcfe9f342e5c6 (diff) | |
| download | rust-bac76afb5a7885de19bfd9e6191fe8e2a29bd74d.tar.gz rust-bac76afb5a7885de19bfd9e6191fe8e2a29bd74d.zip | |
Rustup to rustc 1.30.0-nightly (23f09bbed 2018-08-14)
| -rw-r--r-- | clippy_lints/src/booleans.rs | 2 | ||||
| -rw-r--r-- | clippy_lints/src/copies.rs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/clippy_lints/src/booleans.rs b/clippy_lints/src/booleans.rs index f1596476bfd..ef6f71f6831 100644 --- a/clippy_lints/src/booleans.rs +++ b/clippy_lints/src/booleans.rs @@ -4,7 +4,7 @@ use rustc::hir::*; use rustc::hir::intravisit::*; use syntax::ast::{LitKind, NodeId, DUMMY_NODE_ID}; use syntax::codemap::{dummy_spanned, Span, DUMMY_SP}; -use syntax::util::ThinVec; +use rustc_data_structures::thin_vec::ThinVec; use crate::utils::{in_macro, paths, match_type, snippet_opt, span_lint_and_then, SpanlessEq, get_trait_def_id, implements_trait}; /// **What it does:** Checks for boolean expressions that can be written more diff --git a/clippy_lints/src/copies.rs b/clippy_lints/src/copies.rs index 5709526c600..49518d1bb4e 100644 --- a/clippy_lints/src/copies.rs +++ b/clippy_lints/src/copies.rs @@ -5,7 +5,7 @@ use rustc::hir::*; use std::collections::HashMap; use std::collections::hash_map::Entry; use syntax::symbol::LocalInternedString; -use syntax::util::small_vector::SmallVector; +use rustc_data_structures::small_vec::OneVector; use crate::utils::{SpanlessEq, SpanlessHash}; use crate::utils::{get_parent_expr, in_macro, snippet, span_lint_and_then, span_note_and_lint}; @@ -233,9 +233,9 @@ fn lint_match_arms(cx: &LateContext<'_, '_>, expr: &Expr) { /// sequence of `if/else`. /// Eg. would return `([a, b], [c, d, e])` for the expression /// `if a { c } else if b { d } else { e }`. -fn if_sequence(mut expr: &Expr) -> (SmallVector<&Expr>, SmallVector<&Block>) { - let mut conds = SmallVector::new(); - let mut blocks: SmallVector<&Block> = SmallVector::new(); +fn if_sequence(mut expr: &Expr) -> (OneVector<&Expr>, OneVector<&Block>) { + let mut conds = OneVector::new(); + let mut blocks: OneVector<&Block> = OneVector::new(); while let ExprKind::If(ref cond, ref then_expr, ref else_expr) = expr.node { conds.push(&**cond); |
