diff options
| author | scalexm <alexandre@scalexm.fr> | 2018-12-20 19:54:11 +0100 |
|---|---|---|
| committer | scalexm <alexandre@scalexm.fr> | 2018-12-27 19:21:17 +0100 |
| commit | 993d213fdac8dfcecfa134087be385dc609e4f7b (patch) | |
| tree | 2968f353dc1d64f6d6342bd5279290265841cb23 /src | |
| parent | 81d6f9cc813e8946b6cb2ee29dffeb0000c63e69 (diff) | |
| download | rust-993d213fdac8dfcecfa134087be385dc609e4f7b.tar.gz rust-993d213fdac8dfcecfa134087be385dc609e4f7b.zip | |
Set a `def_id` in `ParamEnv` only with `-Z chalk`
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/ty/mod.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/consts/const-size_of-cycle.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/issues/issue-44415.stderr | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc/ty/mod.rs b/src/librustc/ty/mod.rs index 78ce76a0148..fd8a7db1b47 100644 --- a/src/librustc/ty/mod.rs +++ b/src/librustc/ty/mod.rs @@ -3158,7 +3158,7 @@ fn param_env<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, let unnormalized_env = ty::ParamEnv::new( tcx.intern_predicates(&predicates), traits::Reveal::UserFacing, - Some(def_id) + if tcx.sess.opts.debugging_opts.chalk { Some(def_id) } else { None } ); let body_id = tcx.hir().as_local_node_id(def_id).map_or(DUMMY_NODE_ID, |id| { diff --git a/src/test/ui/consts/const-size_of-cycle.stderr b/src/test/ui/consts/const-size_of-cycle.stderr index b837889400c..8f9498e834d 100644 --- a/src/test/ui/consts/const-size_of-cycle.stderr +++ b/src/test/ui/consts/const-size_of-cycle.stderr @@ -10,7 +10,7 @@ note: ...which requires const-evaluating `Foo::bytes::{{constant}}`... LL | intrinsics::size_of::<T>() | ^^^^^^^^^^^^^^^^^^^^^^^^^^ note: ...which requires computing layout of `Foo`... -note: ...which requires normalizing `ParamEnvAnd { param_env: ParamEnv { caller_bounds: [], reveal: All }, value: [u8; _] }`... +note: ...which requires normalizing `ParamEnvAnd { param_env: ParamEnv { caller_bounds: [], reveal: All, def_id: None }, value: [u8; _] }`... note: ...which requires const-evaluating + checking `Foo::bytes::{{constant}}`... --> $DIR/const-size_of-cycle.rs:6:17 | diff --git a/src/test/ui/issues/issue-44415.stderr b/src/test/ui/issues/issue-44415.stderr index 21a935f57a9..441f1b2a069 100644 --- a/src/test/ui/issues/issue-44415.stderr +++ b/src/test/ui/issues/issue-44415.stderr @@ -10,7 +10,7 @@ note: ...which requires const-evaluating `Foo::bytes::{{constant}}`... LL | bytes: [u8; unsafe { intrinsics::size_of::<Foo>() }], | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ note: ...which requires computing layout of `Foo`... -note: ...which requires normalizing `ParamEnvAnd { param_env: ParamEnv { caller_bounds: [], reveal: All }, value: [u8; _] }`... +note: ...which requires normalizing `ParamEnvAnd { param_env: ParamEnv { caller_bounds: [], reveal: All, def_id: None }, value: [u8; _] }`... note: ...which requires const-evaluating + checking `Foo::bytes::{{constant}}`... --> $DIR/issue-44415.rs:6:17 | |