Auto merge of #1315 - RalfJung:housekeeping, r=RalfJung

Housekeeping

Author: bors

Cargo.lock

@@ -1 +1 @@
-42abbd8878d3b67238f3611b0587c704ba94f39c
+0c835b0cca83fe21090562603e4bda77c183ace3

rust-version

@@ -1,4 +1,4 @@
-use std::alloc::{alloc, dealloc, realloc, Layout};
+use std::alloc::{alloc, dealloc, Layout};
 
 // error-pattern: allocation has size 1 and alignment 1, but gave size 1 and alignment 2
 

test-cargo-miri/Cargo.lock

@@ -1,4 +1,4 @@
-use std::alloc::{alloc, dealloc, realloc, Layout};
+use std::alloc::{alloc, dealloc, Layout};
 
 // error-pattern: allocation has size 1 and alignment 1, but gave size 2 and alignment 1
 

tests/compile-fail/deallocate-bad-alignment.rs

@@ -1,4 +1,4 @@
-use std::alloc::{alloc, dealloc, realloc, Layout};
+use std::alloc::{alloc, dealloc, Layout};
 
 // error-pattern: dereferenced after this allocation got freed
 

tests/compile-fail/deallocate-bad-size.rs

@@ -1,4 +1,4 @@
-use std::alloc::{alloc, dealloc, realloc, Layout};
+use std::alloc::{alloc, realloc, Layout};
 
 // error-pattern: allocation has size 1 and alignment 1, but gave size 2 and alignment 1
 

tests/compile-fail/deallocate-twice.rs

@@ -1,4 +1,4 @@
-use std::alloc::{alloc, dealloc, realloc, Layout};
+use std::alloc::{alloc, realloc, Layout};
 
 fn main() {
     unsafe {