diff options
| author | bors <bors@rust-lang.org> | 2018-10-26 11:05:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-10-26 11:05:00 +0000 |
| commit | 694cf752988728ba5da85c36c2deaeefeb49c05e (patch) | |
| tree | f2501734f55b37ac50bf5604a897c939ccfdc996 /src/test/rustdoc | |
| parent | 82239b04dc9cea1d54422c2fb223ff5321ccafdd (diff) | |
| parent | 13d94ee1154770caa8e027394fa2221db2dfe5c3 (diff) | |
| download | rust-694cf752988728ba5da85c36c2deaeefeb49c05e.tar.gz rust-694cf752988728ba5da85c36c2deaeefeb49c05e.zip | |
Auto merge of #53821 - oli-obk:sanity_query, r=RalfJung
Report const eval error inside the query Functional changes: We no longer warn about bad constants embedded in unused types. This relied on being able to report just a warning, not a hard error on that case, which we cannot do any more now that error reporting is consistently centralized. r? @RalfJung fixes #53561
Diffstat (limited to 'src/test/rustdoc')
| -rw-r--r-- | src/test/rustdoc/const-evalutation-ice.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/rustdoc/const-evalutation-ice.rs b/src/test/rustdoc/const-evalutation-ice.rs index 000ed709a8a..1c04c34ea68 100644 --- a/src/test/rustdoc/const-evalutation-ice.rs +++ b/src/test/rustdoc/const-evalutation-ice.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// Just check if we don't get an ICE for the _S type. +// Just check we don't get an ICE for `N`. use std::cell::Cell; use std::mem; @@ -17,4 +17,4 @@ pub struct S { s: Cell<usize> } -pub type _S = [usize; 0 - (mem::size_of::<S>() != 4) as usize]; +pub const N: usize = 0 - (mem::size_of::<S>() != 4) as usize; |