diff options
| author | Bastian Kauschke <bastian_kauschke@hotmail.de> | 2020-09-09 20:10:23 +0200 |
|---|---|---|
| committer | Bastian Kauschke <bastian_kauschke@hotmail.de> | 2020-09-09 20:10:23 +0200 |
| commit | 74e07198a08fea62ab2fba9ae258f4d118d7dffe (patch) | |
| tree | 24d792412210685c5df850568fdf27294a1faf4c /src | |
| parent | 4226a17845333e3c0495bd85e5836c24b2a70b97 (diff) | |
| download | rust-74e07198a08fea62ab2fba9ae258f4d118d7dffe.tar.gz rust-74e07198a08fea62ab2fba9ae258f4d118d7dffe.zip | |
fix test on 32 bit systems
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/ui/const_evaluatable/function-call.rs | 5 | ||||
| -rw-r--r-- | src/test/ui/const_evaluatable/function-call.stderr | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/test/ui/const_evaluatable/function-call.rs b/src/test/ui/const_evaluatable/function-call.rs index 9b54a541e69..b5de66621c5 100644 --- a/src/test/ui/const_evaluatable/function-call.rs +++ b/src/test/ui/const_evaluatable/function-call.rs @@ -1,8 +1,9 @@ // check-pass -#![warn(const_evaluatable_unchecked)] const fn foo<T>() -> usize { - if std::mem::size_of::<*mut T>() < 8 { // size of *mut T does not depend on T + // We might instead branch on `std::mem::size_of::<*mut T>() < 8` here, + // which would cause this function to fail on 32 bit systems. + if false { std::mem::size_of::<T>() } else { 8 diff --git a/src/test/ui/const_evaluatable/function-call.stderr b/src/test/ui/const_evaluatable/function-call.stderr index a63a2643ad2..0d8463714e8 100644 --- a/src/test/ui/const_evaluatable/function-call.stderr +++ b/src/test/ui/const_evaluatable/function-call.stderr @@ -1,14 +1,10 @@ warning: cannot use constants which depend on generic parameters in types - --> $DIR/function-call.rs:13:17 + --> $DIR/function-call.rs:14:17 | LL | let _ = [0; foo::<T>()]; | ^^^^^^^^^^ | -note: the lint level is defined here - --> $DIR/function-call.rs:2:9 - | -LL | #![warn(const_evaluatable_unchecked)] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ + = note: `#[warn(const_evaluatable_unchecked)]` on by default = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release! = note: for more information, see issue #76200 <https://github.com/rust-lang/rust/issues/76200> |
