bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #31671 - ranma42:printcfg, r=alexcrichton

Browse source 
Show `cfg` as possible argument to `--print` and make it so that `--print cfg` also outputs the `target_feature`s.

Should I also extend `src/test/run-make/print-cfg/Makefile` to check that `target_feature`s are actually printed?
This commit is contained in:
bors 2016-03-03 21:37:18 +00:00
commit e91f889ed3
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc/session/config.rs
View file

@ -887,7 +887,7 @@ pub fn rustc_short_optgroups() -> Vec<RustcOptGroup> {
"[asm|llvm-bc|llvm-ir|obj|link|dep-info]"), "[asm|llvm-bc|llvm-ir|obj|link|dep-info]"),
opt::multi_s("", "print", "Comma separated list of compiler information to \ opt::multi_s("", "print", "Comma separated list of compiler information to \
print on stdout", print on stdout",
"[crate-name|file-names|sysroot|target-list]"), "[crate-name|file-names|sysroot|cfg|target-list]"),
opt::flagmulti_s("g", "", "Equivalent to -C debuginfo=2"), opt::flagmulti_s("g", "", "Equivalent to -C debuginfo=2"),
opt::flagmulti_s("O", "", "Equivalent to -C opt-level=2"), opt::flagmulti_s("O", "", "Equivalent to -C opt-level=2"),
opt::opt_s("o", "", "Write output to <filename>", "FILENAME"), opt::opt_s("o", "", "Write output to <filename>", "FILENAME"),

15
src/librustc_driver/lib.rs
View file

@ -94,7 +94,7 @@ use syntax::errors;
use syntax::errors::emitter::Emitter; use syntax::errors::emitter::Emitter;
use syntax::diagnostics; use syntax::diagnostics;
use syntax::parse::token; use syntax::parse::token;
use syntax::feature_gate::UnstableFeatures; use syntax::feature_gate::{GatedCfg, UnstableFeatures};
#[cfg(test)] #[cfg(test)]
pub mod test; pub mod test;
@ -565,7 +565,18 @@ impl RustcDefaultCalls {
} }
} }
PrintRequest::Cfg => { PrintRequest::Cfg => {
for cfg in config::build_configuration(sess) { let mut cfg = config::build_configuration(&sess);
target_features::add_configuration(&mut cfg, &sess);
let allow_unstable_cfg = match get_unstable_features_setting() {
UnstableFeatures::Disallow => false,
_ => true,
};
for cfg in cfg {
if !allow_unstable_cfg && GatedCfg::gate(&*cfg).is_some() {
continue;
}
match cfg.node { match cfg.node {
ast::MetaItemKind::Word(ref word) => println!("{}", word), ast::MetaItemKind::Word(ref word) => println!("{}", word),
ast::MetaItemKind::NameValue(ref name, ref value) => { ast::MetaItemKind::NameValue(ref name, ref value) => {