]> git.lizzy.rs Git - rust.git/commitdiff
rollup merge of #23749: alexcrichton/remove-old-impl-check
authorAlex Crichton <alex@alexcrichton.com>
Fri, 27 Mar 2015 17:10:38 +0000 (10:10 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Fri, 27 Mar 2015 17:10:38 +0000 (10:10 -0700)
Conflicts:
src/libsyntax/feature_gate.rs

1  2 
src/libstd/lib.rs
src/libstd/old_io/mod.rs
src/libstd/old_io/net/pipe.rs
src/libstd/old_io/net/tcp.rs
src/libstd/old_io/result.rs
src/libsyntax/feature_gate.rs

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index ad0fa500c2875ddb15f879e2a29496cc3b708b07,0f281c6f8f9bd8551331fd98d1b3444e8f265e80..70f43776ff0c1ad6b3eed77777701e870ffa30b6
@@@ -276,12 -277,7 +273,11 @@@ pub const KNOWN_ATTRIBUTES: &'static [(
  
      // FIXME: #19470 this shouldn't be needed forever
      ("old_orphan_check", Whitelisted),
-     ("old_impl_check", Whitelisted),
 -    ("rustc_paren_sugar", Whitelisted), // FIXME: #18101 temporary unboxed closure hack
 +
 +    ("rustc_paren_sugar", Gated("unboxed_closures",
 +                                "unboxed_closures are still evolving")),
 +    ("rustc_reflect_like", Gated("reflect",
 +                                 "defining reflective traits is still evolving")),
  
      // Crate level attributes
      ("crate_name", CrateLevel),