Skip to content

Commit 4f6cde4

Browse files
committed
Auto merge of #111639 - Nilstrieb:rollup-vg149lm, r=Nilstrieb
Rollup of 10 pull requests Successful merges: - #111428 (refactor(resolve): clean up the early error return caused by non-call) - #111449 (Recover `impl<T ?Sized>` correctly) - #111572 (Document that `missing_copy_implementations` and `missing_debug_implementations` only apply to public items.) - #111602 (Suppress "erroneous constant used" for constants tainted by errors) - #111605 (fixup version placeholder for `cfi_encoding` feature) - #111607 (Add clubby789 to the bootstrap review rotation) - #111614 (Add more interesting nonsense to weird-exprs.rs) - #111617 (Fixed typo) - #111620 (Add eholk back to compiler-contributors reviewers) - #111621 (Fix release date of 1.58.1 in release notes.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents e71cd53 + 06318aa commit 4f6cde4

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

src/diagnostics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ pub fn report_error<'tcx, 'mir>(
289289
(None, format!("see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information")),
290290
],
291291
InvalidProgram(
292-
InvalidProgramInfo::AlreadyReported(rustc_errors::ErrorGuaranteed { .. })
292+
InvalidProgramInfo::AlreadyReported(_)
293293
) => {
294294
// This got already reported. No point in reporting it again.
295295
return None;

src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ extern crate rustc_ast;
4747
extern crate rustc_middle;
4848
extern crate rustc_const_eval;
4949
extern crate rustc_data_structures;
50-
extern crate rustc_errors;
5150
extern crate rustc_hir;
5251
extern crate rustc_index;
5352
extern crate rustc_session;

0 commit comments

Comments
 (0)