From: bors <bors@rust-lang.org>
Date: Thu, 5 Apr 2018 07:31:56 +0000 (+0000)
Subject: Auto merge of #48851 - petrochenkov:genparattr, r=nikomatsakis
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=01d0be99257f5942ddc1168db1a7b5a472cf2c31;p=rust.git

Auto merge of #48851 - petrochenkov:genparattr, r=nikomatsakis

Stabilize attributes on generic parameters

Closes https://github.com/rust-lang/rust/issues/48848
---

01d0be99257f5942ddc1168db1a7b5a472cf2c31
diff --cc src/liballoc/lib.rs
index 51a78025401,cbbea6c19c8..6ce2547ef6e
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@@ -97,8 -97,9 +97,8 @@@
  #![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(iter_rfold)]
  #![feature(lang_items)]
  #![feature(needs_allocator)]
  #![feature(nonzero)]