A

al8n · Sep 10, 2024 · 09e480f · 09e480f
1 parent 9e542a7
commit 09e480f
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 22 deletions.
diff --git a/ci/miri_sb.sh b/ci/miri_sb.sh
@@ -5,7 +5,7 @@ rustup toolchain install nightly --component miri
 rustup override set nightly
 cargo miri setup
 
-export MIRIFLAGS="-Zmiri-strict-provenance -Zmiri-disable-isolation -Zmiri-symbolic-alignment-check"
+export MIRIFLAGS="-Zmiri-disable-isolation -Zmiri-symbolic-alignment-check"
 
 cargo miri test --tests --target x86_64-unknown-linux-gnu --all-features
 # cargo miri test --tests --target aarch64-unknown-linux-gnu #crossbeam_utils has problem on this platform

diff --git a/ci/miri_sb_generic.sh b/ci/miri_sb_generic.sh
@@ -5,6 +5,6 @@ rustup toolchain install nightly --component miri
 rustup override set nightly
 cargo miri setup
 
-export MIRIFLAGS="-Zmiri-strict-provenance -Zmiri-disable-isolation -Zmiri-symbolic-alignment-check"
+export MIRIFLAGS="-Zmiri-disable-isolation -Zmiri-symbolic-alignment-check"
 
 cargo miri test --tests --all-features
diff --git a/ci/miri_tb.sh b/ci/miri_tb.sh
@@ -5,7 +5,7 @@ rustup toolchain install nightly --component miri
 rustup override set nightly
 cargo miri setup
 
-export MIRIFLAGS="-Zmiri-strict-provenance -Zmiri-disable-isolation -Zmiri-symbolic-alignment-check -Zmiri-tree-borrows"
+export MIRIFLAGS="-Zmiri-disable-isolation -Zmiri-symbolic-alignment-check -Zmiri-tree-borrows"
 
 cargo miri test --tests --target x86_64-unknown-linux-gnu --all-features
 # cargo miri test --tests --target aarch64-unknown-linux-gnu #crossbeam_utils has problem on this platform

diff --git a/ci/miri_tb_generic.sh b/ci/miri_tb_generic.sh
@@ -5,6 +5,6 @@ rustup toolchain install nightly --component miri
 rustup override set nightly
 cargo miri setup
 
-export MIRIFLAGS="-Zmiri-strict-provenance -Zmiri-disable-isolation -Zmiri-symbolic-alignment-check -Zmiri-tree-borrows"
+export MIRIFLAGS="-Zmiri-disable-isolation -Zmiri-symbolic-alignment-check -Zmiri-tree-borrows"
 
 cargo miri test --tests --all-features
diff --git a/src/swmr/wal/tests.rs b/src/swmr/wal/tests.rs
@@ -4,6 +4,8 @@ use crate::tests::*;
 
 use super::*;
 
+const MB: u32 = 1024 * 1024;
+
 #[test]
 fn test_construct_inmemory() {
   construct_inmemory::<OrderWal<Ascend, Crc32>>();
@@ -38,12 +40,12 @@ fn test_construct_with_small_capacity_map_file() {
 
 #[test]
 fn test_insert_inmemory() {
-  insert(OrderWal::new(Builder::new().with_capacity(1024 * 1024)).unwrap());
+  insert(OrderWal::new(Builder::new().with_capacity(MB)).unwrap());
 }
 
 #[test]
 fn test_insert_map_anon() {
-  insert(OrderWal::map_anon(Builder::new().with_capacity(1024 * 1024)).unwrap());
+  insert(OrderWal::map_anon(Builder::new().with_capacity(MB)).unwrap());
 }
 
 #[test]
@@ -55,7 +57,7 @@ fn test_insert_map_file() {
       dir.path().join("test_swmr_insert_map_file"),
       Builder::new(),
       OpenOptions::new()
-        .create_new(Some(1024 * 1024))
+        .create_new(Some(MB))
         .write(true)
         .read(true),
     )
@@ -65,12 +67,12 @@ fn test_insert_map_file() {
 
 #[test]
 fn test_iter_inmemory() {
-  iter(OrderWal::new(Builder::new().with_capacity(1024 * 1024)).unwrap());
+  iter(OrderWal::new(Builder::new().with_capacity(MB)).unwrap());
 }
 
 #[test]
 fn test_iter_map_anon() {
-  iter(OrderWal::map_anon(Builder::new().with_capacity(1024 * 1024)).unwrap());
+  iter(OrderWal::map_anon(Builder::new().with_capacity(MB)).unwrap());
 }
 
 #[test]
@@ -82,7 +84,7 @@ fn test_iter_map_file() {
       dir.path().join("test_swmr_iter_map_file"),
       Builder::new(),
       OpenOptions::new()
-        .create_new(Some(1024 * 1024))
+        .create_new(Some(MB))
         .write(true)
         .read(true),
     )
@@ -92,12 +94,12 @@ fn test_iter_map_file() {
 
 #[test]
 fn test_range_inmemory() {
-  range(OrderWal::new(Builder::new().with_capacity(1024 * 1024)).unwrap());
+  range(OrderWal::new(Builder::new().with_capacity(MB)).unwrap());
 }
 
 #[test]
 fn test_range_map_anon() {
-  range(OrderWal::map_anon(Builder::new().with_capacity(1024 * 1024)).unwrap());
+  range(OrderWal::map_anon(Builder::new().with_capacity(MB)).unwrap());
 }
 
 #[test]
@@ -109,7 +111,7 @@ fn test_range_map_file() {
       dir.path().join("test_swmr_range_map_file"),
       Builder::new(),
       OpenOptions::new()
-        .create_new(Some(1024 * 1024))
+        .create_new(Some(MB))
         .write(true)
         .read(true),
     )

diff --git a/src/unsync/tests.rs b/src/unsync/tests.rs
@@ -4,6 +4,8 @@ use crate::tests::*;
 
 use super::*;
 
+const MB: u32 = 1024 * 1024;
+
 #[test]
 fn test_construct_inmemory() {
   construct_inmemory::<OrderWal<Ascend, Crc32>>();
@@ -38,12 +40,12 @@ fn test_construct_with_small_capacity_map_file() {
 
 #[test]
 fn test_insert_inmemory() {
-  insert(OrderWal::new(Builder::new().with_capacity(1024 * 1024)).unwrap());
+  insert(OrderWal::new(Builder::new().with_capacity(MB)).unwrap());
 }
 
 #[test]
 fn test_insert_map_anon() {
-  insert(OrderWal::map_anon(Builder::new().with_capacity(1024 * 1024)).unwrap());
+  insert(OrderWal::map_anon(Builder::new().with_capacity(MB)).unwrap());
 }
 
 #[test]
@@ -55,7 +57,7 @@ fn test_insert_map_file() {
       dir.path().join("test_unsync_insert_map_file"),
       Builder::new(),
       OpenOptions::new()
-        .create_new(Some(1024 * 1024))
+        .create_new(Some(MB))
         .write(true)
         .read(true),
     )
@@ -65,12 +67,12 @@ fn test_insert_map_file() {
 
 #[test]
 fn test_iter_inmemory() {
-  iter(OrderWal::new(Builder::new().with_capacity(1024 * 1024)).unwrap());
+  iter(OrderWal::new(Builder::new().with_capacity(MB)).unwrap());
 }
 
 #[test]
 fn test_iter_map_anon() {
-  iter(OrderWal::map_anon(Builder::new().with_capacity(1024 * 1024)).unwrap());
+  iter(OrderWal::map_anon(Builder::new().with_capacity(MB)).unwrap());
 }
 
 #[test]
@@ -82,7 +84,7 @@ fn test_iter_map_file() {
       dir.path().join("test_unsync_iter_map_file"),
       Builder::new(),
       OpenOptions::new()
-        .create_new(Some(1024 * 1024))
+        .create_new(Some(MB))
         .write(true)
         .read(true),
     )
@@ -92,12 +94,12 @@ fn test_iter_map_file() {
 
 #[test]
 fn test_range() {
-  range(OrderWal::new(Builder::new().with_capacity(1024 * 1024)).unwrap());
+  range(OrderWal::new(Builder::new().with_capacity(MB)).unwrap());
 }
 
 #[test]
 fn test_range_map_anon() {
-  range(OrderWal::map_anon(Builder::new().with_capacity(1024 * 1024)).unwrap());
+  range(OrderWal::map_anon(Builder::new().with_capacity(MB)).unwrap());
 }
 
 #[test]
@@ -109,7 +111,7 @@ fn test_range_map_file() {
       dir.path().join("test_unsync_range_map_file"),
       Builder::new(),
       OpenOptions::new()
-        .create_new(Some(1024 * 1024))
+        .create_new(Some(MB))
         .write(true)
         .read(true),
     )