diff options
| author | oli <github35764891676564198441@oli-obk.de> | 2020-12-07 13:09:22 +0000 |
|---|---|---|
| committer | oli <github35764891676564198441@oli-obk.de> | 2021-01-04 21:40:38 +0000 |
| commit | f6d54aa0c165da52560e5c032b4c65bb11833e0e (patch) | |
| tree | 647e8e32a28a1167f19a11b1f0375dbcad5c71b0 | |
| parent | 720205480098bf08a201f4114d057573a5ece8e8 (diff) | |
| download | rust-f6d54aa0c165da52560e5c032b4c65bb11833e0e.tar.gz rust-f6d54aa0c165da52560e5c032b4c65bb11833e0e.zip | |
Adjust imports
| -rw-r--r-- | compiler/rustc_mir/src/monomorphize/polymorphize.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_mir/src/monomorphize/polymorphize.rs b/compiler/rustc_mir/src/monomorphize/polymorphize.rs index e51c9314595..4ad71ab4913 100644 --- a/compiler/rustc_mir/src/monomorphize/polymorphize.rs +++ b/compiler/rustc_mir/src/monomorphize/polymorphize.rs @@ -5,7 +5,7 @@ //! generic parameters are unused (and eventually, in what ways generic parameters are used - only //! for their size, offset of a field, etc.). -use rustc_hir::{def::DefKind, def_id::DefId}; +use rustc_hir::{def::DefKind, def_id::DefId, ConstContext}; use rustc_index::bit_set::FiniteBitSet; use rustc_middle::mir::{ visit::{TyContext, Visitor}, @@ -56,7 +56,7 @@ fn unused_generic_params(tcx: TyCtxt<'_>, def_id: DefId) -> FiniteBitSet<u32> { // Exit early when there is no MIR available. let context = tcx.hir().body_const_context(def_id.expect_local()); match context { - Some(ConstContext::Fn) | None if !tcx.is_mir_available(def_id) => { + Some(ConstContext::ConstFn) | None if !tcx.is_mir_available(def_id) => { debug!("unused_generic_params: (no mir available) def_id={:?}", def_id); return FiniteBitSet::new_empty(); } @@ -80,7 +80,7 @@ fn unused_generic_params(tcx: TyCtxt<'_>, def_id: DefId) -> FiniteBitSet<u32> { let body = match context { // Const functions are actually called and should thus be considered for polymorphization // via their runtime MIR - Some(ConstContext::Fn) | None => tcx.optimized_mir(def_id), + Some(ConstContext::ConstFn) | None => tcx.optimized_mir(def_id), Some(_) => tcx.mir_for_ctfe(def_id), }; let mut vis = MarkUsedGenericParams { tcx, def_id, unused_parameters: &mut unused_parameters }; |
