Use assertion-like static assertions

diff --git a/src/librustc/middle/region.rs b/src/librustc/middle/region.rs
index 56960675b74153f3273dfbf47512b8e2140f6986..b1d6cce11f438f3aeabcbe8a16bda26146965735 100644 (file)
--- a/src/librustc/middle/region.rs
+++ b/src/librustc/middle/region.rs
@@ -152,7 +152,7 @@ pub struct FirstStatementIndex { .. }
 #[allow(dead_code)]
 // only works on stage 1 when the rustc_layout_scalar_valid_range attribute actually exists
 #[cfg(not(stage0))]
-static ASSERT: () = [()][(mem::size_of::<ScopeData>() != 4) as usize];
+static ASSERT: () = [()][!(mem::size_of::<ScopeData>() == 4) as usize];
 
 #[allow(non_snake_case)]
 impl Scope {

diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs
index cfc5cd60b1785df9fe55da5f94f0acd93fdb4677..2aaccb599009d601b8306ba2c0adf9712b28cbe0 100644 (file)
--- a/src/librustc/ty/context.rs
+++ b/src/librustc/ty/context.rs
@@ -830,9 +830,9 @@ impl<'tcx> CommonTypes<'tcx> {
     fn new(interners: &CtxtInterners<'tcx>) -> CommonTypes<'tcx> {
         // Ensure our type representation does not grow
         #[cfg(all(not(stage0), target_pointer_width = "64"))]
-        assert!(mem::size_of::<ty::TyKind>() <= 24);
+        static ASSERT_TY_KIND: () = [()][!(std::mem::size_of::<ty::TyKind>() <= 24) as usize];
         #[cfg(all(not(stage0), target_pointer_width = "64"))]
-        assert!(mem::size_of::<ty::TyS>() <= 32);
+        static ASSERT_TYS: () = [()][!(std::mem::size_of::<ty::TyS>() <= 32) as usize];
 
         let mk = |sty| CtxtInterners::intern_ty(interners, interners, sty);
         let mk_region = |r| {

diff --git a/src/test/ui/consts/const-eval/zst_operand_eval.rs b/src/test/ui/consts/const-eval/zst_operand_eval.rs
index c6deb88d4f1a158fc6c5b61b51e1717d08ec239c..d837da1066daa79d37c98a88dae7cefa80d536ae 100644 (file)
--- a/src/test/ui/consts/const-eval/zst_operand_eval.rs
+++ b/src/test/ui/consts/const-eval/zst_operand_eval.rs
@@ -1,5 +1,5 @@
 // compile-pass
 
-static ASSERT: () = [()][(std::mem::size_of::<u32>() != 4) as usize];
+static ASSERT: () = [()][!(std::mem::size_of::<u32>() == 4) as usize];
 
 fn main() {}