From 9511e6739dad2874aa39350cb74fcbcc28fe087d Mon Sep 17 00:00:00 2001 From: Florian Hartwig Date: Thu, 19 Nov 2015 15:51:30 +0100 Subject: [PATCH] Update to latest rust nightly --- src/attrs.rs | 2 +- src/eq_op.rs | 1 - src/len_zero.rs | 2 +- src/lifetimes.rs | 4 ++-- src/loops.rs | 2 +- src/methods.rs | 2 +- src/misc.rs | 2 +- src/ptr_arg.rs | 2 +- src/shadow.rs | 4 ++-- src/types.rs | 6 +++--- 10 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/attrs.rs b/src/attrs.rs index 79cec664adc..a0101688668 100644 --- a/src/attrs.rs +++ b/src/attrs.rs @@ -49,7 +49,7 @@ fn is_relevant_item(item: &Item) -> bool { fn is_relevant_impl(item: &ImplItem) -> bool { match item.node { - MethodImplItem(_, ref block) => is_relevant_block(block), + ImplItemKind::Method(_, ref block) => is_relevant_block(block), _ => false } } diff --git a/src/eq_op.rs b/src/eq_op.rs index 6f305b6adf8..1d2146537c9 100644 --- a/src/eq_op.rs +++ b/src/eq_op.rs @@ -105,7 +105,6 @@ fn is_cast_ty_equal(left: &Ty, right: &Ty) -> bool { is_cast_ty_equal(&*lrmut.ty, &*rrmut.ty), (&TyPath(ref lq, ref lpath), &TyPath(ref rq, ref rpath)) => both(lq, rq, is_qself_equal) && is_path_equal(lpath, rpath), - (&TyParen(ref lty), &TyParen(ref rty)) => is_cast_ty_equal(lty, rty), (&TyInfer, &TyInfer) => true, _ => false } diff --git a/src/len_zero.rs b/src/len_zero.rs index f5ad37a71be..25645ea8742 100644 --- a/src/len_zero.rs +++ b/src/len_zero.rs @@ -71,7 +71,7 @@ fn check_trait_items(cx: &LateContext, item: &Item, trait_items: &[P] fn check_impl_items(cx: &LateContext, item: &Item, impl_items: &[P]) { fn is_named_self(item: &ImplItem, name: &str) -> bool { - item.name.as_str() == name && if let MethodImplItem(ref sig, _) = + item.name.as_str() == name && if let ImplItemKind::Method(ref sig, _) = item.node { is_self_sig(sig) } else { false } } diff --git a/src/lifetimes.rs b/src/lifetimes.rs index 09c5821dd49..9b47a4d830f 100644 --- a/src/lifetimes.rs +++ b/src/lifetimes.rs @@ -2,7 +2,7 @@ use rustc_front::hir::*; use reexport::*; use rustc::lint::*; use syntax::codemap::Span; -use rustc_front::visit::{Visitor, walk_ty, walk_ty_param_bound}; +use rustc_front::intravisit::{Visitor, walk_ty, walk_ty_param_bound}; use rustc::middle::def::Def::{DefTy, DefTrait}; use std::collections::HashSet; @@ -29,7 +29,7 @@ impl LateLintPass for LifetimePass { } fn check_impl_item(&mut self, cx: &LateContext, item: &ImplItem) { - if let MethodImplItem(ref sig, _) = item.node { + if let ImplItemKind::Method(ref sig, _) = item.node { check_fn_inner(cx, &sig.decl, Some(&sig.explicit_self), &sig.generics, item.span); } diff --git a/src/loops.rs b/src/loops.rs index 60ae2c23f0a..92dff3a7d93 100644 --- a/src/loops.rs +++ b/src/loops.rs @@ -1,7 +1,7 @@ use rustc::lint::*; use rustc_front::hir::*; use reexport::*; -use rustc_front::visit::{Visitor, walk_expr, walk_block, walk_decl}; +use rustc_front::intravisit::{Visitor, walk_expr, walk_block, walk_decl}; use rustc::middle::ty; use rustc::middle::def::DefLocal; use consts::{constant_simple, Constant}; diff --git a/src/methods.rs b/src/methods.rs index 18da7e977d6..275de8d8ebd 100644 --- a/src/methods.rs +++ b/src/methods.rs @@ -77,7 +77,7 @@ impl LateLintPass for MethodsPass { if let ItemImpl(_, _, _, None, ref ty, ref items) = item.node { for implitem in items { let name = implitem.name; - if let MethodImplItem(ref sig, _) = implitem.node { + if let ImplItemKind::Method(ref sig, _) = implitem.node { // check missing trait implementations for &(method_name, n_args, self_kind, out_type, trait_name) in &TRAIT_METHODS { if_let_chain! { diff --git a/src/misc.rs b/src/misc.rs index 857ae1cc0c3..9a8ce74e997 100644 --- a/src/misc.rs +++ b/src/misc.rs @@ -4,7 +4,7 @@ use rustc_front::hir::*; use reexport::*; use rustc_front::util::{is_comparison_binop, binop_to_string}; use syntax::codemap::{Span, Spanned}; -use rustc_front::visit::FnKind; +use rustc_front::intravisit::FnKind; use rustc::middle::ty; use rustc::middle::const_eval::ConstVal::Float; use rustc::middle::const_eval::eval_const_expr_partial; diff --git a/src/ptr_arg.rs b/src/ptr_arg.rs index 78a3c146c0f..78be2af1217 100644 --- a/src/ptr_arg.rs +++ b/src/ptr_arg.rs @@ -34,7 +34,7 @@ impl LateLintPass for PtrArg { } fn check_impl_item(&mut self, cx: &LateContext, item: &ImplItem) { - if let &MethodImplItem(ref sig, _) = &item.node { + if let &ImplItemKind::Method(ref sig, _) = &item.node { if let Some(Node::NodeItem(it)) = cx.tcx.map.find(cx.tcx.map.get_parent(item.id)) { if let ItemImpl(_, _, _, Some(_), _, _) = it.node { return; // ignore trait impls diff --git a/src/shadow.rs b/src/shadow.rs index a1e86028752..3f72722333b 100644 --- a/src/shadow.rs +++ b/src/shadow.rs @@ -2,7 +2,7 @@ use std::ops::Deref; use rustc_front::hir::*; use reexport::*; use syntax::codemap::Span; -use rustc_front::visit::{Visitor, FnKind}; +use rustc_front::intravisit::{Visitor, FnKind}; use rustc::lint::*; use rustc::middle::def::Def::{DefVariant, DefStruct}; @@ -237,7 +237,7 @@ fn check_expr(cx: &LateContext, expr: &Expr, bindings: &mut Vec<(Name, Span)>) { fn check_ty(cx: &LateContext, ty: &Ty, bindings: &mut Vec<(Name, Span)>) { match ty.node { - TyParen(ref sty) | TyObjectSum(ref sty, _) | + TyObjectSum(ref sty, _) | TyVec(ref sty) => check_ty(cx, sty, bindings), TyFixedLengthVec(ref fty, ref expr) => { check_ty(cx, fty, bindings); diff --git a/src/types.rs b/src/types.rs index 68120f65e1f..506509cdfed 100644 --- a/src/types.rs +++ b/src/types.rs @@ -3,7 +3,7 @@ use rustc_front::hir::*; use reexport::*; use rustc_front::util::{is_comparison_binop, binop_to_string}; use syntax::codemap::Span; -use rustc_front::visit::{FnKind, Visitor, walk_ty}; +use rustc_front::intravisit::{FnKind, Visitor, walk_ty}; use rustc::middle::ty; use syntax::ast::IntTy::*; use syntax::ast::UintTy::*; @@ -305,8 +305,8 @@ impl LateLintPass for TypeComplexityPass { fn check_impl_item(&mut self, cx: &LateContext, item: &ImplItem) { match item.node { - ConstImplItem(ref ty, _) | - TypeImplItem(ref ty) => check_type(cx, ty), + ImplItemKind::Const(ref ty, _) | + ImplItemKind::Type(ref ty) => check_type(cx, ty), // methods are covered by check_fn _ => () }