Properly handle cfgs in rustdoc

Rustdoc would previously improperly handle key="value" style cfgs, which
are notably used for Cargo features.

diff --git a/src/librustc/driver/config.rs b/src/librustc/driver/config.rs
index 9804382dbd91d913ddf5b0ac612517579a1e3689..9ce012502446dca7f8d9fcfe3bd6efd4daf0e3e4 100644 (file)
--- a/src/librustc/driver/config.rs
+++ b/src/librustc/driver/config.rs
@@ -630,7 +630,7 @@ pub fn optgroups() -> Vec<getopts::OptGroup> {
 
 
 // Convert strings provided as --cfg [cfgspec] into a crate_cfg
-fn parse_cfgspecs(cfgspecs: Vec<String> ) -> ast::CrateConfig {
+pub fn parse_cfgspecs(cfgspecs: Vec<String> ) -> ast::CrateConfig {
     cfgspecs.into_iter().map(|s| {
         parse::parse_meta_from_source_str("cfgspec".to_string(),
                                           s.to_string(),

diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs
index c5aece4ceacb199115544d9fe03ec23799eb2cf1..f0f08ff7077caf5bcea085847aafc1e4a8f33348 100644 (file)
--- a/src/librustdoc/core.rs
+++ b/src/librustdoc/core.rs
@@ -14,8 +14,6 @@
 use rustc::back::link;
 
 use syntax::{ast, ast_map, codemap, diagnostic};
-use syntax::parse::token;
-use syntax::ptr::P;
 
 use std::cell::RefCell;
 use std::os;
@@ -95,6 +93,7 @@ pub fn run_core(libs: Vec<Path>, cfgs: Vec<String>, externs: Externs,
         lint_opts: vec!((warning_lint, lint::Allow)),
         externs: externs,
         target_triple: triple.unwrap_or(driver::host_triple().to_string()),
+        cfg: config::parse_cfgspecs(cfgs),
         ..config::basic_options().clone()
     };
 
@@ -108,11 +107,7 @@ pub fn run_core(libs: Vec<Path>, cfgs: Vec<String>, externs: Externs,
                                        Some(cpath.clone()),
                                        span_diagnostic_handler);
 
-    let mut cfg = config::build_configuration(&sess);
-    for cfg_ in cfgs.into_iter() {
-        let cfg_ = token::intern_and_get_ident(cfg_.as_slice());
-        cfg.push(P(codemap::dummy_spanned(ast::MetaWord(cfg_))));
-    }
+    let cfg = config::build_configuration(&sess);
 
     let krate = driver::phase_1_parse_input(&sess, cfg, &input);