user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added rustdoc book documentation, improved behavior when unstable flag not present

Browse source
This commit is contained in:
Dario Gonzalez 2019-06-12 10:49:41 -07:00
parent 657e24c56b
commit 14110ebd93
3 changed files with 56 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/librustdoc/html/markdown.rs
View file

@ -665,7 +665,7 @@ impl LangString {
}
"no_run" => { data.no_run = true; seen_rust_tags = !seen_other_tags; }
"ignore" => { data.ignore = Ignore::All; seen_rust_tags = !seen_other_tags; }
x if enable_per_target_ignores && x.starts_with("ignore-") => {
x if x.starts_with("ignore-") => if enable_per_target_ignores {
ignores.push(x.trim_start_matches("ignore-").to_owned());
seen_rust_tags = !seen_other_tags;
}
@ -696,15 +696,9 @@ impl LangString {
_ => { seen_other_tags = true }
}
}
match data.ignore {
Ignore::All => {},
Ignore::None => {
if !ignores.is_empty() {
data.ignore = Ignore::Some(ignores);
}
},
_ => unreachable!(),
// ignore-foo overrides ignore
if !ignores.is_empty() {
data.ignore = Ignore::Some(ignores);
}
data.rust &= !seen_other_tags || seen_rust_tags;

2
src/librustdoc/test.rs
View file

@ -58,8 +58,10 @@ pub fn run(options: Options) -> i32 {
..config::basic_debugging_options()
},
edition: options.edition,
target_triple: options.target.clone(),
..config::Options::default()
};
let config = interface::Config {
opts: sessopts,
crate_cfg: config::parse_cfgspecs(options.cfgs.clone()),