From 59bb0fe66ea6d80c5e1466b9609887e4cf7cde47 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Thu, 17 May 2018 18:02:47 +0300 Subject: [PATCH] Fix align_offset_stride1 & align_to_simple tests --- src/libcore/tests/ptr.rs | 2 +- src/libcore/tests/slice.rs | 2 +- 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={:?} || {:?} || {:?} || {:?}",