rename `rustc_const_eval` to `rustc_const_math`

31 files changed, 29 insertions, 29 deletions

diff --git a/src/librustc/Cargo.toml b/src/librustc/Cargo.toml
index d2dc5f1ed93..cdbe8696a90 100644
--- a/src/librustc/Cargo.toml
+++ b/src/librustc/Cargo.toml
@@ -18,7 +18,7 @@ log = { path = "../liblog" }
 rbml = { path = "../librbml" }
 rustc_back = { path = "../librustc_back" }
 rustc_bitflags = { path = "../librustc_bitflags" }
-rustc_const_eval = { path = "../librustc_const_eval" }
+rustc_const_math = { path = "../librustc_const_math" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_front = { path = "../librustc_front" }
 serialize = { path = "../libserialize" }
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index 6b5f889fcfb..1728bec5a8d 100644
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -55,7 +55,7 @@ extern crate rustc_front;
 extern crate rustc_data_structures;
 extern crate serialize;
 extern crate collections;
-extern crate rustc_const_eval;
+extern crate rustc_const_math;
 #[macro_use] extern crate log;
 #[macro_use] extern crate syntax;
 #[macro_use] #[no_link] extern crate rustc_bitflags;
diff --git a/src/librustc/middle/const_eval.rs b/src/librustc/middle/const_eval.rs
index fca2904979c..f685e4c0e18 100644
--- a/src/librustc/middle/const_eval.rs
+++ b/src/librustc/middle/const_eval.rs
@@ -46,7 +46,7 @@ use std::hash;
 use std::mem::transmute;
 use std::rc::Rc;
 
-use rustc_const_eval::*;
+use rustc_const_math::*;
 
 macro_rules! math {
     ($e:expr, $op:expr) => {
diff --git a/src/librustc/mir/repr.rs b/src/librustc/mir/repr.rs
index b9073810783..d3b1a8d6c13 100644
--- a/src/librustc/mir/repr.rs
+++ b/src/librustc/mir/repr.rs
@@ -10,7 +10,7 @@
 
 use graphviz::IntoCow;
 use middle::const_eval::ConstVal;
-use rustc_const_eval::{ConstUsize, ConstInt};
+use rustc_const_math::{ConstUsize, ConstInt};
 use middle::def_id::DefId;
 use ty::subst::Substs;
 use ty::{self, AdtDef, ClosureSubsts, FnOutput, Region, Ty};
diff --git a/src/librustc/mir/visit.rs b/src/librustc/mir/visit.rs
index 856902bea3c..d11eea811cd 100644
--- a/src/librustc/mir/visit.rs
+++ b/src/librustc/mir/visit.rs
@@ -13,7 +13,7 @@ use middle::def_id::DefId;
 use ty::subst::Substs;
 use ty::{ClosureSubsts, FnOutput, Region, Ty};
 use mir::repr::*;
-use rustc_const_eval::ConstUsize;
+use rustc_const_math::ConstUsize;
 use rustc_data_structures::tuple_slice::TupleSlice;
 use syntax::codemap::Span;
 
diff --git a/src/librustc/ty/mod.rs b/src/librustc/ty/mod.rs
index d080724fac9..5c754fc12d7 100644
--- a/src/librustc/ty/mod.rs
+++ b/src/librustc/ty/mod.rs
@@ -50,7 +50,7 @@ use syntax::attr::{self, AttrMetaMethods};
 use syntax::codemap::{DUMMY_SP, Span};
 use syntax::parse::token::InternedString;
 
-use rustc_const_eval::ConstInt;
+use rustc_const_math::ConstInt;
 
 use rustc_front::hir;
 use rustc_front::hir::{ItemImpl, ItemTrait, PatKind};
diff --git a/src/librustc/ty/util.rs b/src/librustc/ty/util.rs
index b870dc47ec7..970c807b36f 100644
--- a/src/librustc/ty/util.rs
+++ b/src/librustc/ty/util.rs
@@ -22,7 +22,7 @@ use ty::{self, Ty, TyCtxt, TypeAndMut, TypeFlags, TypeFoldable};
 use ty::{Disr, ParameterEnvironment};
 use ty::TypeVariants::*;
 
-use rustc_const_eval::{ConstInt, ConstIsize, ConstUsize};
+use rustc_const_math::{ConstInt, ConstIsize, ConstUsize};
 
 use std::cmp;
 use std::hash::{Hash, SipHasher, Hasher};
diff --git a/src/librustc_const_eval/Cargo.toml b/src/librustc_const_math/Cargo.toml
index f885e9a94d5..10aadabe22e 100644
--- a/src/librustc_const_eval/Cargo.toml
+++ b/src/librustc_const_math/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 authors = ["The Rust Project Developers"]
-name = "rustc_const_eval"
+name = "rustc_const_math"
 version = "0.0.0"
 
 [lib]
-name = "rustc_const_eval"
+name = "rustc_const_math"
 path = "lib.rs"
 crate-type = ["dylib"]
 
diff --git a/src/librustc_const_eval/err.rs b/src/librustc_const_math/err.rs
index 126b3824efe..126b3824efe 100644
--- a/src/librustc_const_eval/err.rs
+++ b/src/librustc_const_math/err.rs
diff --git a/src/librustc_const_eval/int.rs b/src/librustc_const_math/int.rs
index 7576a984bec..7576a984bec 100644
--- a/src/librustc_const_eval/int.rs
+++ b/src/librustc_const_math/int.rs
diff --git a/src/librustc_const_eval/is.rs b/src/librustc_const_math/is.rs
index 082c6510f8b..082c6510f8b 100644
--- a/src/librustc_const_eval/is.rs
+++ b/src/librustc_const_math/is.rs
diff --git a/src/librustc_const_eval/lib.rs b/src/librustc_const_math/lib.rs
index 80b8c75104a..9f66aac6e38 100644
--- a/src/librustc_const_eval/lib.rs
+++ b/src/librustc_const_math/lib.rs
@@ -14,7 +14,7 @@
 //!
 //! This API is completely unstable and subject to change.
 
-#![crate_name = "rustc_const_eval"]
+#![crate_name = "rustc_const_math"]
 #![unstable(feature = "rustc_private", issue = "27812")]
 #![crate_type = "dylib"]
 #![crate_type = "rlib"]
diff --git a/src/librustc_const_eval/us.rs b/src/librustc_const_math/us.rs
index e5a7086d436..e5a7086d436 100644
--- a/src/librustc_const_eval/us.rs
+++ b/src/librustc_const_math/us.rs
diff --git a/src/librustc_metadata/Cargo.toml b/src/librustc_metadata/Cargo.toml
index e8b5a7efdd9..65c2c2d1480 100644
--- a/src/librustc_metadata/Cargo.toml
+++ b/src/librustc_metadata/Cargo.toml
@@ -15,7 +15,7 @@ rbml = { path = "../librbml" }
 rustc = { path = "../librustc" }
 rustc_back = { path = "../librustc_back" }
 rustc_bitflags = { path = "../librustc_bitflags" }
-rustc_const_eval = { path = "../librustc_const_eval" }
+rustc_const_math = { path = "../librustc_const_math" }
 rustc_front = { path = "../librustc_front" }
 rustc_llvm = { path = "../librustc_llvm" }
 serialize = { path = "../libserialize" }
diff --git a/src/librustc_metadata/decoder.rs b/src/librustc_metadata/decoder.rs
index e6f516ccd33..b9ebd3c3afa 100644
--- a/src/librustc_metadata/decoder.rs
+++ b/src/librustc_metadata/decoder.rs
@@ -36,7 +36,7 @@ use rustc::ty::subst;
 use rustc::ty::{ImplContainer, TraitContainer};
 use rustc::ty::{self, Ty, TyCtxt, TypeFoldable, VariantKind};
 
-use rustc_const_eval::ConstInt;
+use rustc_const_math::ConstInt;
 
 use rustc::mir;
 use rustc::mir::visit::MutVisitor;
diff --git a/src/librustc_metadata/lib.rs b/src/librustc_metadata/lib.rs
index a6c612f5397..674106dd82a 100644
--- a/src/librustc_metadata/lib.rs
+++ b/src/librustc_metadata/lib.rs
@@ -37,7 +37,7 @@ extern crate rustc;
 extern crate rustc_back;
 extern crate rustc_front;
 extern crate rustc_llvm;
-extern crate rustc_const_eval;
+extern crate rustc_const_math;
 
 pub use rustc::middle;
 
diff --git a/src/librustc_mir/Cargo.toml b/src/librustc_mir/Cargo.toml
index 99237c9fa5f..35c29e2cf2d 100644
--- a/src/librustc_mir/Cargo.toml
+++ b/src/librustc_mir/Cargo.toml
@@ -13,7 +13,7 @@ graphviz = { path = "../libgraphviz" }
 log = { path = "../liblog" }
 rustc = { path = "../librustc" }
 rustc_back = { path = "../librustc_back" }
-rustc_const_eval = { path = "../librustc_const_eval" }
+rustc_const_math = { path = "../librustc_const_math" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_front = { path = "../librustc_front" }
 syntax = { path = "../libsyntax" }
diff --git a/src/librustc_mir/build/scope.rs b/src/librustc_mir/build/scope.rs
index bac7b310dc7..ffaf02bbfee 100644
--- a/src/librustc_mir/build/scope.rs
+++ b/src/librustc_mir/build/scope.rs
@@ -95,7 +95,7 @@ use rustc::mir::repr::*;
 use syntax::codemap::{Span, DUMMY_SP};
 use syntax::parse::token::intern_and_get_ident;
 use rustc::middle::const_eval::ConstVal;
-use rustc_const_eval::ConstInt;
+use rustc_const_math::ConstInt;
 
 pub struct Scope<'tcx> {
     /// the scope-id within the scope_datas
diff --git a/src/librustc_mir/hair/cx/expr.rs b/src/librustc_mir/hair/cx/expr.rs
index aa55ee3e3f7..231acbfb488 100644
--- a/src/librustc_mir/hair/cx/expr.rs
+++ b/src/librustc_mir/hair/cx/expr.rs
@@ -10,7 +10,7 @@
 
 use hair::*;
 use rustc_data_structures::fnv::FnvHashMap;
-use rustc_const_eval::ConstInt;
+use rustc_const_math::ConstInt;
 use hair::cx::Cx;
 use hair::cx::block;
 use hair::cx::to_ref::ToRef;
diff --git a/src/librustc_mir/hair/cx/mod.rs b/src/librustc_mir/hair/cx/mod.rs
index 30467a981d9..9bd94e432bf 100644
--- a/src/librustc_mir/hair/cx/mod.rs
+++ b/src/librustc_mir/hair/cx/mod.rs
@@ -26,7 +26,7 @@ use rustc::ty::{self, Ty, TyCtxt};
 use syntax::codemap::Span;
 use syntax::parse::token;
 use rustc_front::hir;
-use rustc_const_eval::{ConstInt, ConstUsize};
+use rustc_const_math::{ConstInt, ConstUsize};
 
 #[derive(Copy, Clone)]
 pub struct Cx<'a, 'tcx: 'a> {
diff --git a/src/librustc_mir/lib.rs b/src/librustc_mir/lib.rs
index 67bac196f48..3b55f62717c 100644
--- a/src/librustc_mir/lib.rs
+++ b/src/librustc_mir/lib.rs
@@ -32,7 +32,7 @@ extern crate rustc_data_structures;
 extern crate rustc_front;
 extern crate rustc_back;
 extern crate syntax;
-extern crate rustc_const_eval;
+extern crate rustc_const_math;
 
 pub mod build;
 pub mod graphviz;
diff --git a/src/librustc_trans/Cargo.toml b/src/librustc_trans/Cargo.toml
index b7faafeba9a..e884442f03b 100644
--- a/src/librustc_trans/Cargo.toml
+++ b/src/librustc_trans/Cargo.toml
@@ -16,7 +16,7 @@ graphviz = { path = "../libgraphviz" }
 log = { path = "../liblog" }
 rustc = { path = "../librustc" }
 rustc_back = { path = "../librustc_back" }
-rustc_const_eval = { path = "../librustc_const_eval" }
+rustc_const_math = { path = "../librustc_const_math" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_front = { path = "../librustc_front" }
 rustc_llvm = { path = "../librustc_llvm" }
diff --git a/src/librustc_trans/consts.rs b/src/librustc_trans/consts.rs
index 8302fc0158c..b2edcbd9b9e 100644
--- a/src/librustc_trans/consts.rs
+++ b/src/librustc_trans/consts.rs
@@ -38,7 +38,7 @@ use rustc::ty::adjustment::{AdjustUnsafeFnPointer, AdjustMutToConstPointer};
 use rustc::ty::{self, Ty, TyCtxt};
 use rustc::ty::cast::{CastTy,IntTy};
 use util::nodemap::NodeMap;
-use rustc_const_eval::{ConstInt, ConstMathErr, ConstUsize, ConstIsize};
+use rustc_const_math::{ConstInt, ConstMathErr, ConstUsize, ConstIsize};
 
 use rustc_front::hir;
 
diff --git a/src/librustc_trans/lib.rs b/src/librustc_trans/lib.rs
index 103de7e42af..c85008181a4 100644
--- a/src/librustc_trans/lib.rs
+++ b/src/librustc_trans/lib.rs
@@ -51,7 +51,7 @@ pub extern crate rustc_llvm as llvm;
 extern crate rustc_mir;
 extern crate rustc_platform_intrinsics as intrinsics;
 extern crate serialize;
-extern crate rustc_const_eval;
+extern crate rustc_const_math;
 
 #[macro_use] extern crate log;
 #[macro_use] extern crate syntax;
diff --git a/src/librustc_trans/mir/constant.rs b/src/librustc_trans/mir/constant.rs
index be1c3f3b56b..cdb54eadbdd 100644
--- a/src/librustc_trans/mir/constant.rs
+++ b/src/librustc_trans/mir/constant.rs
@@ -11,7 +11,7 @@
 use llvm::ValueRef;
 use rustc::ty::{Ty, TypeFoldable};
 use rustc::middle::const_eval::{self, ConstVal};
-use rustc_const_eval::ConstInt::*;
+use rustc_const_math::ConstInt::*;
 use rustc::mir::repr as mir;
 use abi;
 use common::{self, BlockAndBuilder, C_bool, C_bytes, C_floating_f64, C_integral,
diff --git a/src/librustc_trans/mir/rvalue.rs b/src/librustc_trans/mir/rvalue.rs
index 47fa618ebad..b90be5e0ab6 100644
--- a/src/librustc_trans/mir/rvalue.rs
+++ b/src/librustc_trans/mir/rvalue.rs
@@ -12,7 +12,7 @@ use llvm::ValueRef;
 use rustc::ty::{self, Ty};
 use rustc::ty::cast::{CastTy, IntTy};
 use middle::const_eval::ConstVal;
-use rustc_const_eval::ConstInt;
+use rustc_const_math::ConstInt;
 use rustc::mir::repr as mir;
 
 use asm;
diff --git a/src/librustc_typeck/Cargo.toml b/src/librustc_typeck/Cargo.toml
index 1c907972863..6e1bca87a82 100644
--- a/src/librustc_typeck/Cargo.toml
+++ b/src/librustc_typeck/Cargo.toml
@@ -15,6 +15,6 @@ arena = { path = "../libarena" }
 fmt_macros = { path = "../libfmt_macros" }
 rustc = { path = "../librustc" }
 rustc_back = { path = "../librustc_back" }
-rustc_const_eval = { path = "../librustc_const_eval" }
+rustc_const_math = { path = "../librustc_const_math" }
 rustc_front = { path = "../librustc_front" }
 rustc_platform_intrinsics = { path = "../librustc_platform_intrinsics" }
diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs
index af40b845767..bd2e0092a89 100644
--- a/src/librustc_typeck/astconv.rs
+++ b/src/librustc_typeck/astconv.rs
@@ -65,7 +65,7 @@ use rscope::{self, UnelidableRscope, RegionScope, ElidableRscope,
 use util::common::{ErrorReported, FN_OUTPUT_NAME};
 use util::nodemap::FnvHashSet;
 
-use rustc_const_eval::ConstInt;
+use rustc_const_math::ConstInt;
 
 use syntax::{abi, ast};
 use syntax::codemap::{Span, Pos};
diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs
index 0b447b2009b..743a2bb2211 100644
--- a/src/librustc_typeck/collect.rs
+++ b/src/librustc_typeck/collect.rs
@@ -81,7 +81,7 @@ use util::common::{ErrorReported, MemoizationMap};
 use util::nodemap::{FnvHashMap, FnvHashSet};
 use write_ty_to_tcx;
 
-use rustc_const_eval::ConstInt;
+use rustc_const_math::ConstInt;
 
 use std::cell::RefCell;
 use std::collections::HashSet;
diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs
index 9b0fdd8a2e3..9c08f57b833 100644
--- a/src/librustc_typeck/lib.rs
+++ b/src/librustc_typeck/lib.rs
@@ -92,7 +92,7 @@ extern crate rustc;
 extern crate rustc_platform_intrinsics as intrinsics;
 extern crate rustc_front;
 extern crate rustc_back;
-extern crate rustc_const_eval;
+extern crate rustc_const_math;
 
 pub use rustc::dep_graph;
 pub use rustc::front;
diff --git a/src/test/auxiliary/dummy_mir_pass.rs b/src/test/auxiliary/dummy_mir_pass.rs
index 3e1b46522a9..edf1c2c3a39 100644
--- a/src/test/auxiliary/dummy_mir_pass.rs
+++ b/src/test/auxiliary/dummy_mir_pass.rs
@@ -16,7 +16,7 @@
 #[macro_use] extern crate rustc;
 extern crate rustc_front;
 extern crate rustc_plugin;
-extern crate rustc_const_eval;
+extern crate rustc_const_math;
 extern crate syntax;
 
 use rustc::mir::transform::{self, MirPass};
@@ -24,7 +24,7 @@ use rustc::mir::repr::{Mir, Literal};
 use rustc::mir::visit::MutVisitor;
 use rustc::ty;
 use rustc::middle::const_eval::ConstVal;
-use rustc_const_eval::ConstInt;
+use rustc_const_math::ConstInt;
 use rustc_plugin::Registry;
 
 use syntax::ast::NodeId;