about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-04-26 12:49:11 +0000
committerbors <bors@rust-lang.org>2019-04-26 12:49:11 +0000
commit597f432489f12a3f33419daa039ccef11a12c4fd (patch)
tree3cd3da80e4b6baf13184f19c9e76224090086ec2 /src/libstd
parent3ee936378662bd2e74be951d6a7011a95a6bd84d (diff)
parentcf9d6672b76c08e556416e4da43cebfc2bcb1a97 (diff)
downloadrust-597f432489f12a3f33419daa039ccef11a12c4fd.tar.gz
rust-597f432489f12a3f33419daa039ccef11a12c4fd.zip
Auto merge of #60303 - CryZe:patch-6, r=Centril
Stabilize pointer::align_offset

Closes #44488
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/lib.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 7b0e090fb1b..215f1bbc971 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -227,7 +227,6 @@
 // std is implemented with unstable features, many of which are internal
 // compiler details that will never be stable
 // NB: the following list is sorted to minimize merge conflicts.
-#![feature(align_offset)]
 #![feature(alloc_error_handler)]
 #![feature(alloc_layout_extra)]
 #![feature(allocator_api)]