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

rustup; account for ptr_offset_from stabilization @bors r+
2020-08-24 08:07:41 +00:00 · 2020-08-24 08:07:41 +00:00 · 9f3e7cf2c2
commit 9f3e7cf2c2
parent 222093e815 2f9de18f88
2 changed files with 1 additions and 2 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-1a22a0ff93d63f738151f096434e732466b4a42e
+c4b6d9411f939c1ad7b3521b907fa101f3360462
--- a/tests/run-pass/ptr_offset.rs
+++ b/tests/run-pass/ptr_offset.rs
@ -1,4 +1,3 @@
-#![feature(ptr_offset_from)]
 use std::{mem, ptr};

 fn main() {