about summary refs log tree commit diff
path: root/src/libcore/tests
diff options
context:
space:
mode:
authorSimonas Kazlauskas <git@kazlauskas.me>2018-05-17 18:02:47 +0300
committerSimonas Kazlauskas <git@kazlauskas.me>2018-05-17 23:13:43 +0300
commit59bb0fe66ea6d80c5e1466b9609887e4cf7cde47 (patch)
treec4236ac1e073711c0f1bdf808ef237a2bfd8f732 /src/libcore/tests
parent6d5bf8b23f4e59fdc67f635a10f450dfab2f076b (diff)
downloadrust-59bb0fe66ea6d80c5e1466b9609887e4cf7cde47.tar.gz
rust-59bb0fe66ea6d80c5e1466b9609887e4cf7cde47.zip
Fix align_offset_stride1 & align_to_simple tests
Diffstat (limited to 'src/libcore/tests')
-rw-r--r--src/libcore/tests/ptr.rs2
-rw-r--r--src/libcore/tests/slice.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/tests/ptr.rs b/src/libcore/tests/ptr.rs
index 9384cb32798..31bc1d67768 100644
--- a/src/libcore/tests/ptr.rs
+++ b/src/libcore/tests/ptr.rs
@@ -322,8 +322,8 @@ fn align_offset_stride1() {
             let offset = if expected == 0 { 0 } else { align - expected };
             assert_eq!((ptr as *const u8).align_offset(align), offset,
             "ptr = {}, align = {}, size = 1", ptr, align);
-            align = (align + 1).next_power_of_two();
         }
+        align = (align + 1).next_power_of_two();
     }
 }
 
diff --git a/src/libcore/tests/slice.rs b/src/libcore/tests/slice.rs
index 8acb531b989..fcd79222e16 100644
--- a/src/libcore/tests/slice.rs
+++ b/src/libcore/tests/slice.rs
@@ -821,7 +821,7 @@ fn test_align_to_simple() {
     assert!(prefix == [1] || suffix == [7]);
     let expect1 = [1 << 8 | 2, 3 << 8 | 4, 5 << 8 | 6];
     let expect2 = [1 | 2 << 8, 3 | 4 << 8, 5 | 6 << 8];
-    let expect3 = [2 | 3 << 8, 4 | 5 << 8, 6 | 7 << 8];
+    let expect3 = [2 << 8 | 3, 4 << 8 | 5, 6 << 8 | 7];
     let expect4 = [2 | 3 << 8, 4 | 5 << 8, 6 | 7 << 8];
     assert!(aligned == expect1 || aligned == expect2 || aligned == expect3 || aligned == expect4,
             "aligned={:?} expected={:?} || {:?} || {:?} || {:?}",