Merge remote-tracking branch 'origin/master' into fat-ptr-eq

Author: RalfJung

rust-version

@@ -1 +1 @@
-nightly-2019-02-13
+nightly-2019-02-14

tests/run-pass/heap_system.rs

@@ -0,0 +1,29 @@
+//ignore-windows: Inspects allocation base address on Windows
+#![feature(allocator_api)]
+
+use std::alloc::{Global, Alloc, Layout, System};
+
+fn check_overalign_requests<T: Alloc>(mut allocator: T) {
+    let size = 8;
+    let align = 16; // greater than size
+    let iterations = 1; // Miri is deterministic, no need to try many times
+    unsafe {
+        let pointers: Vec<_> = (0..iterations).map(|_| {
+            allocator.alloc(Layout::from_size_align(size, align).unwrap()).unwrap()
+        }).collect();
+        for &ptr in &pointers {
+            assert_eq!((ptr.as_ptr() as usize) % align, 0,
+                       "Got a pointer less aligned than requested")
+        }
+
+        // Clean up
+        for &ptr in &pointers {
+            allocator.dealloc(ptr, Layout::from_size_align(size, align).unwrap())
+        }
+    }
+}
+
+fn main() {
+    check_overalign_requests(System);
+    check_overalign_requests(Global);
+}

tests/run-pass/strings.rs

@@ -18,10 +18,17 @@ fn fat_pointer_on_32_bit() {
     Some(5).expect("foo");
 }
 
+fn str_indexing() {
+    let mut x = "Hello".to_string();
+    let _v = &mut x[..3];  // Test IndexMut on String.
+}
+
 fn main() {
     assert_eq!(empty(), "");
     assert_eq!(hello(), "Hello, world!");
     assert_eq!(hello_bytes(), b"Hello, world!");
     assert_eq!(hello_bytes_fat(), b"Hello, world!");
+
     fat_pointer_on_32_bit(); // Should run without crashing.
+    str_indexing();
 }