diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2017-05-15 18:00:35 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2017-05-22 15:55:56 -0400 |
| commit | 45dd0632bc63a04cdc1499a392d83139e2e8c348 (patch) | |
| tree | 1037d09e98c29653c9b63fa1e3a96b30a3eeb1af /src/librustc_mir/transform | |
| parent | 697146bf406deaa790915da346b6188220e562be (diff) | |
| download | rust-45dd0632bc63a04cdc1499a392d83139e2e8c348.tar.gz rust-45dd0632bc63a04cdc1499a392d83139e2e8c348.zip | |
rename `parameter_environment` to `param_env`
Diffstat (limited to 'src/librustc_mir/transform')
| -rw-r--r-- | src/librustc_mir/transform/inline.rs | 2 | ||||
| -rw-r--r-- | src/librustc_mir/transform/qualify_consts.rs | 4 | ||||
| -rw-r--r-- | src/librustc_mir/transform/type_check.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc_mir/transform/inline.rs b/src/librustc_mir/transform/inline.rs index 5516d84e121..edb2f44d18e 100644 --- a/src/librustc_mir/transform/inline.rs +++ b/src/librustc_mir/transform/inline.rs @@ -220,7 +220,7 @@ impl<'a, 'tcx> Inliner<'a, 'tcx> { // FIXME: Give a bonus to functions with only a single caller let def_id = tcx.hir.local_def_id(self.source.item_id()); - let param_env = tcx.parameter_environment(def_id); + let param_env = tcx.param_env(def_id); let mut first_block = true; let mut cost = 0; diff --git a/src/librustc_mir/transform/qualify_consts.rs b/src/librustc_mir/transform/qualify_consts.rs index c839061df16..4e84cbe6fec 100644 --- a/src/librustc_mir/transform/qualify_consts.rs +++ b/src/librustc_mir/transform/qualify_consts.rs @@ -937,7 +937,7 @@ fn mir_const_qualif<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, return Qualif::NOT_CONST.bits(); } - let param_env = tcx.parameter_environment(def_id); + let param_env = tcx.param_env(def_id); let mut qualifier = Qualifier::new(tcx, param_env, def_id, mir, Mode::Const); qualifier.qualify_const().bits() @@ -965,7 +965,7 @@ impl MirPass for QualifyAndPromoteConstants { MirSource::Const(_) | MirSource::Promoted(..) => return }; - let param_env = tcx.parameter_environment(def_id); + let param_env = tcx.param_env(def_id); if mode == Mode::Fn || mode == Mode::ConstFn { // This is ugly because Qualifier holds onto mir, diff --git a/src/librustc_mir/transform/type_check.rs b/src/librustc_mir/transform/type_check.rs index 82c0d2c1b01..6d9603ea459 100644 --- a/src/librustc_mir/transform/type_check.rs +++ b/src/librustc_mir/transform/type_check.rs @@ -751,7 +751,7 @@ impl MirPass for TypeckMir { // broken MIR, so try not to report duplicate errors. return; } - let param_env = tcx.parameter_environment(def_id); + let param_env = tcx.param_env(def_id); tcx.infer_ctxt(param_env, Reveal::UserFacing).enter(|infcx| { let mut checker = TypeChecker::new(&infcx, item_id); { |