rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Factor scraping and rendering into separate calls to rustdoc

Browse Source 
Simplify toggle UI logic, add workspace root for URLs
This commit is contained in:
Will Crichton
2021-06-01 14:02:09 -07:00
parent 7831fee9f8
commit 2855bf039a
8 changed files with 139 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/librustdoc/lib.rs
View File

@@ -619,8 +619,10 @@ fn opts() -> Vec<RustcOptGroup> {
"Make the identifiers in the HTML source code pages navigable",
)
}),
unstable("scrape-examples", |o| o.optmulti("", "scrape-examples", "", "")),
unstable("scrape-examples", |o| o.optopt("", "scrape-examples", "", "")),
unstable("workspace-root", |o| o.optopt("", "workspace-root", "", "")),
unstable("repository-url", |o| o.optopt("", "repository-url", "", "")),
unstable("with-examples", |o| o.optmulti("", "with-examples", "", "")),
]
}
@@ -700,28 +702,20 @@ fn run_renderer<'tcx, T: formats::FormatRenderer<'tcx>>(
}
}
fn main_options(mut options: config::Options) -> MainResult {
fn main_options(options: config::Options) -> MainResult {
let diag = core::new_handler(options.error_format, None, &options.debugging_opts);
match (options.should_test, options.markdown_input()) {
(true, true) => return wrap_return(&diag, markdown::test(options)),
(true, false) => return doctest::run(options),
(false, true) => {
match (options.should_test, options.markdown_input(), options.scrape_examples.is_some()) {
(_, _, true) => return scrape_examples::run(options),
(true, true, false) => return wrap_return(&diag, markdown::test(options)),
(true, false, false) => return doctest::run(options),
(false, true, false) => {
return wrap_return(
&diag,
markdown::render(&options.input, options.render_options, options.edition),
);
}
(false, false) => {}
}
if options.scrape_examples.len() > 0 {
if let Some(crate_name) = &options.crate_name {
options.render_options.call_locations =
Some(scrape_examples::scrape(&options.scrape_examples, crate_name)?);
} else {
// raise an error?
}
(false, false, false) => {}
}
// need to move these items separately because we lose them by the time the closure is called,