diff options
| author | bors <bors@rust-lang.org> | 2022-10-12 06:57:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-12 06:57:24 +0000 |
| commit | e6ce5627a9e8af9ae4673a390954fffaf526e5cc (patch) | |
| tree | a7787f3dd60a56b679bd953185cf48229c971d41 /compiler/rustc_errors/src/lib.rs | |
| parent | 2b91cbe2d4ce90d30520674876e9d700cf7a561b (diff) | |
| parent | 96bcced390ee149436bab890b70821ff34912b53 (diff) | |
| download | rust-e6ce5627a9e8af9ae4673a390954fffaf526e5cc.tar.gz rust-e6ce5627a9e8af9ae4673a390954fffaf526e5cc.zip | |
Auto merge of #102948 - Dylan-DPC:rollup-j8h74rb, r=Dylan-DPC
Rollup of 8 pull requests
Successful merges:
- #102110 (Migrate rustc_passes diagnostics)
- #102187 (Use correct location for type tests in promoted constants)
- #102239 (Move style guide to rust-lang/rust)
- #102578 (Panic for invalid arguments of `{integer primitive}::ilog{,2,10}` in all modes)
- #102811 (Use memset to initialize readbuf)
- #102890 (Check representability in adt_sized_constraint)
- #102913 (unify `IsPattern` and `IsImport` enum in `show_candidates`)
- #102924 (rustdoc: remove unused classes from sidebar links)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src/lib.rs')
| -rw-r--r-- | compiler/rustc_errors/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs index 2f6686f8196..c8ccdc539af 100644 --- a/compiler/rustc_errors/src/lib.rs +++ b/compiler/rustc_errors/src/lib.rs @@ -374,7 +374,7 @@ pub use diagnostic::{ AddToDiagnostic, DecorateLint, Diagnostic, DiagnosticArg, DiagnosticArgFromDisplay, DiagnosticArgValue, DiagnosticId, DiagnosticStyledString, IntoDiagnosticArg, SubDiagnostic, }; -pub use diagnostic_builder::{DiagnosticBuilder, EmissionGuarantee}; +pub use diagnostic_builder::{DiagnosticBuilder, EmissionGuarantee, Noted}; use std::backtrace::Backtrace; /// A handler deals with errors and other compiler output. |