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

diff --git a/src/array_indexing.rs b/src/array_indexing.rs
index 344a8b8c34e0ac2ad4f871f7af7e94331cef1849..e5f54c128ef6c063baa17b90e5832a3e60b3df3c 100644 (file)
--- a/src/array_indexing.rs
+++ b/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;
 

diff --git a/src/bit_mask.rs b/src/bit_mask.rs
index 28fc311507d9a424c5a7f9060c6b6929476d068c..cbe601ba1b4637daaee0f25ec374ffba73583da5 100644 (file)
--- a/src/bit_mask.rs
+++ b/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.

diff --git a/src/consts.rs b/src/consts.rs
index 97a99dda4b5b40ff372f244bd125b90ffd25ed51..73f2bc4653a1abff2e6354ade715a6fe2c799f7c 100644 (file)
--- a/src/consts.rs
+++ b/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};

diff --git a/src/enum_clike.rs b/src/enum_clike.rs
index 85fa418f278892ddeb91677f0ccb63746beae279..0e2a7a5304fc56b0cae28b8256a5561d37836da9 100644 (file)
--- a/src/enum_clike.rs
+++ b/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`.

diff --git a/src/identity_op.rs b/src/identity_op.rs
index 9ade801abb37a74ece1171021c75cfcb73c3701b..c25047b87b417b4fa57f66278a63fea42398792d 100644 (file)
--- a/src/identity_op.rs
+++ b/src/identity_op.rs
@@ -3,7 +3,7 @@
 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`.
 ///

diff --git a/src/lib.rs b/src/lib.rs
index 2d12532fcfea00997db66f84cd4385ece2e65232..75970449582f0aa1f997d75bf533dd4787095641 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -42,6 +42,7 @@ fn main() {
 
 extern crate rustc_plugin;
 extern crate rustc_const_eval;
+extern crate rustc_const_math;
 use rustc_plugin::Registry;
 
 pub mod consts;

diff --git a/src/loops.rs b/src/loops.rs
index 10a8a76d7ae99159e9bf62dcb15b68854afe6ecb..20d0fc026d15396da5220eeba955db29bb754a5f 100644 (file)
--- a/src/loops.rs
+++ b/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;

diff --git a/src/matches.rs b/src/matches.rs
index 7bffd445f6b92210f8d4e1d16a5b1ab19e18bd80..40013209e57a7afa3b1a3e6f769df7120fc6772b 100644 (file)
--- a/src/matches.rs
+++ b/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;

diff --git a/src/methods.rs b/src/methods.rs
index b8bbc0e9068784ba210e18bde795e96f2e8fc7c9..3ba6bfc9b41fa8abfb7fc1a7ef23ad982b84ae97 100644 (file)
--- a/src/methods.rs
+++ b/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;

diff --git a/src/misc.rs b/src/misc.rs
index 5a787ba6dbaf1e08c14e604274f37b4c91056b9e..a6cfec276e556ec59acd3fa950826bda351c34f1 100644 (file)
--- a/src/misc.rs
+++ b/src/misc.rs
@@ -1,9 +1,9 @@
 use reexport::*;
 use rustc::lint::*;
-use rustc::middle::const_eval::ConstVal::Float;
-use rustc::middle::const_eval::EvalHint::ExprTypeChecked;
-use rustc::middle::const_eval::eval_const_expr_partial;
+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_front::hir::*;
 use rustc_front::intravisit::FnKind;
 use rustc_front::util::{is_comparison_binop, binop_to_string};
@@ -180,7 +180,7 @@ fn check_expr(&mut self, cx: &LateContext, expr: &Expr) {
 
 fn is_allowed(cx: &LateContext, expr: &Expr) -> bool {
     let res = eval_const_expr_partial(cx.tcx, expr, ExprTypeChecked, None);
-    if let Ok(Float(val)) = res {
+    if let Ok(ConstVal::Float(val)) = res {
         val == 0.0 || val == ::std::f64::INFINITY || val == ::std::f64::NEG_INFINITY
     } else {
         false

diff --git a/src/regex.rs b/src/regex.rs
index e8a71a2cb5a629822033bb63368442b2d1bdafe0..46ee7776d66dd7f10777c5732bbb71397737e057 100644 (file)
--- a/src/regex.rs
+++ b/src/regex.rs
@@ -1,7 +1,8 @@
 use regex_syntax;
 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_const_eval::EvalHint::ExprTypeChecked;
+use rustc_const_eval::eval_const_expr_partial;
 use rustc_front::hir::*;
 use std::collections::HashSet;
 use std::error::Error;

diff --git a/src/types.rs b/src/types.rs
index c2fc242ec537c7afedc2ac3ea9532cf63e1eb683..8e9ac1217f07ef30c48aabcb39a476b8b4b6cdf0 100644 (file)
--- a/src/types.rs
+++ b/src/types.rs
@@ -1,6 +1,6 @@
 use reexport::*;
 use rustc::lint::*;
-use rustc::middle::{const_eval, def};
+use rustc::middle::def;
 use rustc::ty;
 use rustc_front::hir::*;
 use rustc_front::intravisit::{FnKind, Visitor, walk_ty};
@@ -683,10 +683,11 @@ enum Rel {
 }
 
 fn detect_extreme_expr<'a>(cx: &LateContext, expr: &'a Expr) -> Option<ExtremeExpr<'a>> {
-    use rustc::middle::const_eval::EvalHint::ExprTypeChecked;
-    use types::ExtremeType::*;
-    use rustc::middle::const_eval::ConstVal::*;
+    use rustc::middle::const_val::ConstVal::*;
+    use rustc_const_math::*;
+    use rustc_const_eval::EvalHint::ExprTypeChecked;
     use rustc_const_eval::*;
+    use types::ExtremeType::*;
 
     let ty = &cx.tcx.expr_ty(expr).sty;
 
@@ -695,7 +696,7 @@ fn detect_extreme_expr<'a>(cx: &LateContext, expr: &'a Expr) -> Option<ExtremeEx
         _ => return None,
     };
 
-    let cv = match const_eval::eval_const_expr_partial(cx.tcx, expr, ExprTypeChecked, None) {
+    let cv = match eval_const_expr_partial(cx.tcx, expr, ExprTypeChecked, None) {
         Ok(val) => val,
         Err(_) => return None,
     };

diff --git a/tests/consts.rs b/tests/consts.rs
index 3a774f674734d60cb4f97699a7f42f5928a8bc6f..b7b2f6a3f835b89bb8eda5648446b23ae6801a1f 100644 (file)
--- a/tests/consts.rs
+++ b/tests/consts.rs
@@ -2,22 +2,19 @@
 #![feature(rustc_private)]
 
 extern crate clippy;
-extern crate syntax;
 extern crate rustc;
-extern crate rustc_front;
 extern crate rustc_const_eval;
+extern crate rustc_const_math;
+extern crate rustc_front;
+extern crate syntax;
 
+use clippy::consts::{constant_simple, Constant, FloatWidth};
+use rustc_const_math::ConstInt;
 use rustc_front::hir::*;
-use rustc_const_eval::ConstInt;
+use syntax::ast::{LitIntType, LitKind, StrStyle};
+use syntax::codemap::{Spanned, COMMAND_LINE_SP};
 use syntax::parse::token::InternedString;
 use syntax::ptr::P;
-use syntax::codemap::{Spanned, COMMAND_LINE_SP};
-
-use syntax::ast::LitKind;
-use syntax::ast::LitIntType;
-use syntax::ast::StrStyle;
-
-use clippy::consts::{constant_simple, Constant, FloatWidth};
 
 fn spanned<T>(t: T) -> Spanned<T> {
     Spanned{ node: t, span: COMMAND_LINE_SP }