Merge pull request #821 from mcarton/rustup

Rustup to 1.9.0-nightly (30a3849 2016-03-30)

Author: mcarton

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "clippy"
-version = "0.0.58"
+version = "0.0.59"
 authors = [
 	"Manish Goregaokar <[email protected]>",
 	"Andre Bogus <[email protected]>",

src/array_indexing.rs

@@ -1,9 +1,10 @@
 use rustc::lint::*;
-use rustc::middle::const_eval::EvalHint::ExprTypeChecked;
-use rustc::middle::const_eval::{eval_const_expr_partial, ConstVal};
+use rustc::middle::const_val::ConstVal;
 use rustc::ty::TyArray;
+use rustc_const_eval::EvalHint::ExprTypeChecked;
+use rustc_const_eval::eval_const_expr_partial;
+use rustc_const_math::ConstInt;
 use rustc_front::hir::*;
-use rustc_const_eval::ConstInt;
 use syntax::ast::RangeLimits;
 use utils;
 

src/bit_mask.rs

@@ -1,11 +1,10 @@
 use rustc::lint::*;
-use rustc::middle::const_eval::lookup_const_by_id;
 use rustc::middle::def::{Def, PathResolution};
+use rustc_const_eval::lookup_const_by_id;
 use rustc_front::hir::*;
 use rustc_front::util::is_comparison_binop;
 use syntax::ast::LitKind;
 use syntax::codemap::Span;
-
 use utils::span_lint;
 
 /// **What it does:** This lint checks for incompatible bit masks in comparisons.

src/consts.rs

@@ -1,10 +1,10 @@
 #![allow(cast_possible_truncation)]
 
 use rustc::lint::LateContext;
-use rustc::middle::const_eval::lookup_const_by_id;
 use rustc::middle::def::{Def, PathResolution};
+use rustc_const_eval::lookup_const_by_id;
+use rustc_const_math::{ConstInt, ConstUsize, ConstIsize};
 use rustc_front::hir::*;
-use rustc_const_eval::{ConstInt, ConstUsize, ConstIsize};
 use std::cmp::Ordering::{self, Equal};
 use std::cmp::PartialOrd;
 use std::hash::{Hash, Hasher};

src/enum_clike.rs

@@ -1,9 +1,10 @@
 //! lint on C-like enums that are `repr(isize/usize)` and have values that don't fit into an `i32`
 
 use rustc::lint::*;
-use syntax::attr::*;
+use rustc::middle::const_val::ConstVal;
+use rustc_const_math::*;
 use rustc_front::hir::*;
-use rustc::middle::const_eval::{ConstVal, EvalHint, eval_const_expr_partial};
+use syntax::attr::*;
 use utils::span_lint;
 
 /// **What it does:** Lints on C-like enums that are `repr(isize/usize)` and have values that don't fit into an `i32`.

src/identity_op.rs

@@ -3,7 +3,7 @@ use rustc::lint::*;
 use rustc_front::hir::*;
 use syntax::codemap::Span;
 use utils::{span_lint, snippet, in_macro};
-use rustc_const_eval::ConstInt;
+use rustc_const_math::ConstInt;
 
 /// **What it does:** This lint checks for identity operations, e.g. `x + 0`.
 ///

src/lib.rs

@@ -42,6 +42,7 @@ extern crate quine_mc_cluskey;
 
 extern crate rustc_plugin;
 extern crate rustc_const_eval;
+extern crate rustc_const_math;
 use rustc_plugin::Registry;
 
 pub mod consts;

src/loops.rs

@@ -1,11 +1,12 @@
 use reexport::*;
 use rustc::front::map::Node::NodeBlock;
 use rustc::lint::*;
-use rustc::middle::const_eval::EvalHint::ExprTypeChecked;
-use rustc::middle::const_eval::{ConstVal, eval_const_expr_partial};
+use rustc::middle::const_val::ConstVal;
 use rustc::middle::def::Def;
 use rustc::middle::region::CodeExtent;
 use rustc::ty;
+use rustc_const_eval::EvalHint::ExprTypeChecked;
+use rustc_const_eval::eval_const_expr_partial;
 use rustc_front::hir::*;
 use rustc_front::intravisit::{Visitor, walk_expr, walk_block, walk_decl};
 use std::borrow::Cow;

src/matches.rs

@@ -1,9 +1,10 @@
 use rustc::lint::*;
-use rustc::middle::const_eval::EvalHint::ExprTypeChecked;
-use rustc::middle::const_eval::{eval_const_expr_partial, ConstVal};
+use rustc::middle::const_val::ConstVal;
 use rustc::ty;
+use rustc_const_eval::EvalHint::ExprTypeChecked;
+use rustc_const_eval::eval_const_expr_partial;
+use rustc_const_math::ConstInt;
 use rustc_front::hir::*;
-use rustc_const_eval::ConstInt;
 use std::cmp::Ordering;
 use syntax::ast::LitKind;
 use syntax::codemap::Span;

src/methods.rs

@@ -1,9 +1,10 @@
 use rustc::lint::*;
-use rustc::middle::const_eval::EvalHint::ExprTypeChecked;
-use rustc::middle::const_eval::{ConstVal, eval_const_expr_partial};
+use rustc::middle::const_val::ConstVal;
 use rustc::middle::cstore::CrateStore;
 use rustc::ty::subst::{Subst, TypeSpace};
 use rustc::ty;
+use rustc_const_eval::EvalHint::ExprTypeChecked;
+use rustc_const_eval::eval_const_expr_partial;
 use rustc_front::hir::*;
 use std::borrow::Cow;
 use std::fmt;