diff options
| author | bors <bors@rust-lang.org> | 2019-02-27 15:54:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-27 15:54:48 +0000 |
| commit | 7e001e5c6c7c090b41416a57d4be412ed3ccd937 (patch) | |
| tree | ce855b209ccee43fab95888a7778c0414611da2e /src/librustdoc/core.rs | |
| parent | 485537074062d6310178101b198606573527723c (diff) | |
| parent | 1394b6f3a1e607e3651f90e929ccd357c9f8bf80 (diff) | |
| download | rust-7e001e5c6c7c090b41416a57d4be412ed3ccd937.tar.gz rust-7e001e5c6c7c090b41416a57d4be412ed3ccd937.zip | |
Auto merge of #58777 - Centril:rollup, r=Centril
Rollup of 14 pull requests
Successful merges:
- #58075 (Fix for issue #58050)
- #58627 (rustdoc: move collapse and unindent docs passes earlier)
- #58630 (Make `visit_clobber` panic-safe.)
- #58678 (Deny `async fn` in 2015 edition)
- #58680 (Fix an indexing error when using `x.py help`)
- #58703 (Fix copy-pasted typo for read_string return value)
- #58744 (Update dlmalloc to 0.1.3)
- #58746 (std: docs: Disable running several Stdio doctests)
- #58748 (update scoped_tls to 1.0)
- #58749 (Reduce Repetitions of (n << amt) >> amt)
- #58752 (Update string_cache_codegen to 0.4.2)
- #58755 (Clarify `rotate_{left,right}` docs)
- #58757 (Normalize the type Self resolves to in an impl)
- #58761 (Add tracking issue for the unwind attribute)
Failed merges:
r? @ghost
Diffstat (limited to 'src/librustdoc/core.rs')
| -rw-r--r-- | src/librustdoc/core.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs index 226924c41c5..4dce4e86cc4 100644 --- a/src/librustdoc/core.rs +++ b/src/librustdoc/core.rs @@ -603,10 +603,12 @@ pub fn run_core(options: RustdocOptions) -> (clean::Crate, RenderInfo, RenderOpt passes::defaults(default_passes).iter().map(|p| p.to_string()).collect(); passes.extend(manual_passes); + info!("Executing passes"); + for pass in &passes { - // the "unknown pass" error will be reported when late passes are run - if let Some(pass) = passes::find_pass(pass).and_then(|p| p.early_fn()) { - krate = pass(krate, &ctxt); + match passes::find_pass(pass).map(|p| p.pass) { + Some(pass) => krate = pass(krate, &ctxt), + None => error!("unknown pass {}, skipping", *pass), } } |
