Skip to content

Commit 14ca83a

Browse files
committed
Auto merge of #105486 - matthiaskrgr:rollup-o7c4l1c, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - #105216 (Remove unused GUI test) - #105245 (attempt to clarify align_to docs) - #105387 (Improve Rustdoc scrape-examples UI) - #105389 (Enable profiler in dist-powerpc64le-linux) - #105427 (Dont silently ignore rustdoc errors) - #105442 (rustdoc: clean up docblock table CSS) - #105443 (Move some queries and methods) - #105455 (use the correct `Reveal` during validation) - #105470 (Clippy: backport ICE fix before beta branch) - #105474 (lib docs: fix typo) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents badd6a5 + 3d72731 commit 14ca83a

File tree

39 files changed

+2016
-1152
lines changed

39 files changed

+2016
-1152
lines changed

compiler/rustc_const_eval/src/transform/validate.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
33
use rustc_data_structures::fx::FxHashSet;
44
use rustc_index::bit_set::BitSet;
5+
use rustc_infer::traits::Reveal;
56
use rustc_middle::mir::interpret::Scalar;
67
use rustc_middle::mir::visit::NonUseContext::VarDebugInfo;
78
use rustc_middle::mir::visit::{PlaceContext, Visitor};
@@ -44,8 +45,11 @@ impl<'tcx> MirPass<'tcx> for Validator {
4445
return;
4546
}
4647
let def_id = body.source.def_id();
47-
let param_env = tcx.param_env(def_id);
4848
let mir_phase = self.mir_phase;
49+
let param_env = match mir_phase.reveal() {
50+
Reveal::UserFacing => tcx.param_env(def_id),
51+
Reveal::All => tcx.param_env_reveal_all_normalized(def_id),
52+
};
4953

5054
let always_live_locals = always_storage_live_locals(body);
5155
let storage_liveness = MaybeStorageLive::new(always_live_locals)

compiler/rustc_infer/src/infer/error_reporting/mod.rs

+2-660
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)