rename `ParameterEnvironment` to `ParamEnv`

[rust.git] / src / librustc_passes / consts.rs

diff --git a/src/librustc_passes/consts.rs b/src/librustc_passes/consts.rs
index 9a8ea52a6654b2673ec61a3b2db2713c2a31b4fd..8b58e71a0d6d4d1455f540584a103e8f94e24c5f 100644 (file)
--- a/src/librustc_passes/consts.rs
+++ b/src/librustc_passes/consts.rs
@@ -38,7 +38,7 @@
 use rustc::middle::mem_categorization as mc;
 use rustc::middle::mem_categorization::Categorization;
 use rustc::mir::transform::MirSource;
-use rustc::ty::{self, ParameterEnvironment, Ty, TyCtxt};
+use rustc::ty::{self, ParamEnv, Ty, TyCtxt};
 use rustc::traits::Reveal;
 use rustc::util::common::ErrorReported;
 use rustc::util::nodemap::NodeSet;
@@ -58,7 +58,7 @@ struct CheckCrateVisitor<'a, 'tcx: 'a> {
     in_fn: bool,
     promotable: bool,
     mut_rvalue_borrows: NodeSet,
-    param_env: ty::ParameterEnvironment<'tcx>,
+    param_env: ty::ParamEnv<'tcx>,
     tables: &'a ty::TypeckTables<'tcx>,
 }
 
@@ -466,7 +466,7 @@ pub fn check_crate<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>) {
         in_fn: false,
         promotable: false,
         mut_rvalue_borrows: NodeSet(),
-        param_env: ParameterEnvironment::empty(),
+        param_env: ParamEnv::empty(),
     }.as_deep_visitor());
     tcx.sess.abort_if_errors();
 }