about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-04-05 07:31:56 +0000
committerbors <bors@rust-lang.org>2018-04-05 07:31:56 +0000
commit01d0be99257f5942ddc1168db1a7b5a472cf2c31 (patch)
tree4d0e5d5aefa24e1a27ac6fd5217d9b2bfa233750 /src/liballoc
parent4bf76d6745046af32d0c0f33484aa15bab1c0e2c (diff)
parent1a2a23447e451faee7ffbffab2be8831f3098f6d (diff)
downloadrust-01d0be99257f5942ddc1168db1a7b5a472cf2c31.tar.gz
rust-01d0be99257f5942ddc1168db1a7b5a472cf2c31.zip
Auto merge of #48851 - petrochenkov:genparattr, r=nikomatsakis
Stabilize attributes on generic parameters

Closes https://github.com/rust-lang/rust/issues/48848
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
index 51a78025401..6ce2547ef6e 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -97,7 +97,7 @@
 #![feature(fmt_internals)]
 #![feature(from_ref)]
 #![feature(fundamental)]
-#![feature(generic_param_attrs)]
+#![cfg_attr(stage0, feature(generic_param_attrs))]
 #![cfg_attr(stage0, feature(i128_type))]
 #![feature(lang_items)]
 #![feature(needs_allocator)]