Auto merge of #858 - RalfJung:rustup, r=RalfJung

bors · bors · commit d32a87a11dba · 2019-07-26T08:16:07.000Z
bump Rust
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-a7f28678bbf4e16893bb6a718e427504167a9494
+4268e7ee22935f086b856ef0063a9e22b49aeddb
diff --git a/tests/run-pass/intrinsics.rs b/tests/run-pass/intrinsics.rs
@@ -11,5 +11,5 @@ fn main() {
     assert_eq!(size_of_val(&[1, 2, 3] as &[i32]), 12);
     assert_eq!(size_of_val("foobar"), 6);
 
-    assert_eq!(unsafe { type_name::<Option<i32>>() }, "core::option::Option<i32>");
+    assert_eq!(type_name::<Option<i32>>(), "core::option::Option<i32>");
 }

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@ fn main() {`
`11`	`11`	`assert_eq!(size_of_val(&[1, 2, 3] as &[i32]), 12);`
`12`	`12`	`assert_eq!(size_of_val("foobar"), 6);`
`13`	`13`
`14`		`- assert_eq!(unsafe { type_name::<Option<i32>>() }, "core::option::Option<i32>");`
	`14`	`+ assert_eq!(type_name::<Option<i32>>(), "core::option::Option<i32>");`
`15`	`15`	`}`