diff options
| author | bors <bors@rust-lang.org> | 2024-03-24 16:09:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-03-24 16:09:51 +0000 |
| commit | d36bdd19f2940876e84d4e68f2ec3832507b3a33 (patch) | |
| tree | 023271c928991b253dc6d143dd9cbc039bb6cae4 /src/tools/rustfmt | |
| parent | 6e6c72174207174077905315d13cbf7ed9043475 (diff) | |
| parent | cdf86bf4430a6b068eb2acec2c5bbf4f87ee1118 (diff) | |
| download | rust-d36bdd19f2940876e84d4e68f2ec3832507b3a33.tar.gz rust-d36bdd19f2940876e84d4e68f2ec3832507b3a33.zip | |
Auto merge of #123004 - matthiaskrgr:rollup-s3v4p50, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - #122737 (conditionally ignore fatal diagnostic in the SilentEmitter) - #122757 (Fixed the `private-dependency` bug) - #122886 (add test for #90192) - #122937 (Unbox and unwrap the contents of `StatementKind::Coverage`) - #122949 (Add a regression test for #117310) - #122962 (Track run-make-support lib in common inputs stamp) - #122977 (Rename `Arguments::as_const_str` to `as_statically_known_str`) - #122983 (Fix build failure on ARM/AArch64/PowerPC/RISC-V FreeBSD/NetBSD) - #122984 (panic-in-panic-hook: formatting a message that's just a string is risk-free) - #122992 (std::thread: refine available_parallelism for solaris/illumos.) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/tools/rustfmt')
| -rw-r--r-- | src/tools/rustfmt/src/parse/session.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/rustfmt/src/parse/session.rs b/src/tools/rustfmt/src/parse/session.rs index cb46e65999d..1a39d212386 100644 --- a/src/tools/rustfmt/src/parse/session.rs +++ b/src/tools/rustfmt/src/parse/session.rs @@ -121,6 +121,7 @@ fn default_dcx( fallback_bundle, fatal_dcx: DiagCtxt::new(emitter), fatal_note: None, + emit_fatal_diagnostic: false, }) } else { emitter @@ -209,7 +210,7 @@ impl ParseSess { rustc_driver::DEFAULT_LOCALE_RESOURCES.to_vec(), false, ); - self.raw_psess.dcx.make_silent(fallback_bundle, None); + self.raw_psess.dcx.make_silent(fallback_bundle, None, false); } pub(crate) fn span_to_filename(&self, span: Span) -> FileName { |