diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2025-01-06 20:59:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-06 20:59:36 +0100 |
| commit | 873ae7a5ad71afc1f7f7fcd8474d7d8d0ce6e89f (patch) | |
| tree | 03291f9057f838ec4ea344136d00431ca2a992d4 | |
| parent | 7d4b6dc8615a5e0b6a17646980277e2b483bf297 (diff) | |
| parent | 0705ea2a1cef7cd92cdd15ea12d30782c7bfb4bb (diff) | |
| download | rust-873ae7a5ad71afc1f7f7fcd8474d7d8d0ce6e89f.tar.gz rust-873ae7a5ad71afc1f7f7fcd8474d7d8d0ce6e89f.zip | |
Rollup merge of #135157 - bjorn3:fix_rustdoc_error_abort, r=jieyouxu,GuillaumeGomez
Move the has_errors check in rustdoc back to after TyCtxt is created This was accidentally moved before TyCtxt creation by https://github.com/rust-lang/rust/pull/134302.
| -rw-r--r-- | src/librustdoc/lib.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index d74dcc98cb0..96ca96ee6bc 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -865,11 +865,11 @@ fn main_args( } let krate = rustc_interface::passes::parse(sess); - if sess.dcx().has_errors().is_some() { - sess.dcx().fatal("Compilation failed, aborting rustdoc"); - } - rustc_interface::create_and_enter_global_ctxt(compiler, krate, |tcx| { + if sess.dcx().has_errors().is_some() { + sess.dcx().fatal("Compilation failed, aborting rustdoc"); + } + let (krate, render_opts, mut cache) = sess.time("run_global_ctxt", || { core::run_global_ctxt(tcx, show_coverage, render_options, output_format) }); |
