diff options
| author | Oliver Scherer <github35764891676564198441@oli-obk.de> | 2019-06-07 19:22:42 +0200 |
|---|---|---|
| committer | Oliver Scherer <github35764891676564198441@oli-obk.de> | 2019-09-17 16:31:55 +0200 |
| commit | 0de9485038a5a068644efbfa397feec6d02e05ea (patch) | |
| tree | 7fe630e4c2870bbb78245e0e91f01ee0e1e072f0 /src/test | |
| parent | 5670d048c0f88af9976b5505c7853b23dd06770d (diff) | |
| download | rust-0de9485038a5a068644efbfa397feec6d02e05ea.tar.gz rust-0de9485038a5a068644efbfa397feec6d02e05ea.zip | |
Get rid of special const intrinsic query in favour of `const_eval`
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/compile-fail/issue-44415.rs (renamed from src/test/ui/issues/issue-44415.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/consts/const-size_of-cycle.stderr | 5 | ||||
| -rw-r--r-- | src/test/ui/issues/issue-44415.stderr | 28 |
3 files changed, 5 insertions, 28 deletions
diff --git a/src/test/ui/issues/issue-44415.rs b/src/test/compile-fail/issue-44415.rs index 763f8574873..763f8574873 100644 --- a/src/test/ui/issues/issue-44415.rs +++ b/src/test/compile-fail/issue-44415.rs diff --git a/src/test/ui/consts/const-size_of-cycle.stderr b/src/test/ui/consts/const-size_of-cycle.stderr index fdba359e746..1ae39e7563a 100644 --- a/src/test/ui/consts/const-size_of-cycle.stderr +++ b/src/test/ui/consts/const-size_of-cycle.stderr @@ -14,6 +14,11 @@ note: ...which requires const-evaluating `Foo::bytes::{{constant}}#0`... | LL | intrinsics::size_of::<T>() | ^^^^^^^^^^^^^^^^^^^^^^^^^^ +note: ...which requires const-evaluating + checking `std::intrinsics::size_of`... + --> $SRC_DIR/libcore/intrinsics.rs:LL:COL + | +LL | pub fn size_of<T>() -> usize; + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ = note: ...which requires computing layout of `Foo`... = note: ...which requires normalizing `ParamEnvAnd { param_env: ParamEnv { caller_bounds: [], reveal: All, def_id: None }, value: [u8; _] }`... = note: ...which again requires const-evaluating + checking `Foo::bytes::{{constant}}#0`, completing the cycle diff --git a/src/test/ui/issues/issue-44415.stderr b/src/test/ui/issues/issue-44415.stderr deleted file mode 100644 index 8008e53f65f..00000000000 --- a/src/test/ui/issues/issue-44415.stderr +++ /dev/null @@ -1,28 +0,0 @@ -error[E0391]: cycle detected when const-evaluating + checking `Foo::bytes::{{constant}}#0` - --> $DIR/issue-44415.rs:6:17 - | -LL | bytes: [u8; unsafe { intrinsics::size_of::<Foo>() }], - | ^^^^^^ - | -note: ...which requires const-evaluating + checking `Foo::bytes::{{constant}}#0`... - --> $DIR/issue-44415.rs:6:17 - | -LL | bytes: [u8; unsafe { intrinsics::size_of::<Foo>() }], - | ^^^^^^ -note: ...which requires const-evaluating `Foo::bytes::{{constant}}#0`... - --> $DIR/issue-44415.rs:6:26 - | -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, def_id: None }, value: [u8; _] }`... - = note: ...which again requires const-evaluating + checking `Foo::bytes::{{constant}}#0`, completing the cycle -note: cycle used when processing `Foo` - --> $DIR/issue-44415.rs:5:1 - | -LL | struct Foo { - | ^^^^^^^^^^ - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0391`. |