]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #14320 : kballard/rust/fix_stdlib_inject_attrs, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 21 May 2014 16:46:27 +0000 (09:46 -0700)
committerbors <bors@rust-lang.org>
Wed, 21 May 2014 16:46:27 +0000 (09:46 -0700)
The #[phase(syntax,link)] attribute on `extern crate std` needs to be an
outer attribute so it can pretty-print properly.

Also add `#![no_std]` and `#[feature(phase)]` so compiling the
pretty-printed source will work.

1  2 
src/librustc/metadata/encoder.rs
src/librustc/middle/trans/base.rs

Simple merge
Simple merge