diff options
| author | bors <bors@rust-lang.org> | 2024-02-21 16:05:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-02-21 16:05:46 +0000 |
| commit | f8131a48a46ac3bc8a3d0fe0477055b132cffdc3 (patch) | |
| tree | 9a2ee4e170ea5ee7fe632fbb43c1fb3aad4a7e32 /compiler/rustc_errors/src/lib.rs | |
| parent | 1d447a9946effc38c4b964a888ab408a3df3c246 (diff) | |
| parent | bd7ba278e5f9bec119aef80e5fd09b2f93700c42 (diff) | |
| download | rust-f8131a48a46ac3bc8a3d0fe0477055b132cffdc3.tar.gz rust-f8131a48a46ac3bc8a3d0fe0477055b132cffdc3.zip | |
Auto merge of #121400 - fmease:rollup-8m29g7a, r=fmease
Rollup of 8 pull requests Successful merges: - #121044 (Support async trait bounds in macros) - #121175 (match lowering: test one or pattern at a time) - #121340 (bootstrap: apply most of clippy's suggestions) - #121347 (compiletest: support auxiliaries with auxiliaries) - #121359 (miscellaneous type system improvements) - #121366 (Remove `diagnostic_builder.rs`) - #121379 (Remove an `unchecked_error_guaranteed` call.) - #121396 (make it possible for outside crates to inspect a mir::ConstValue with the interpreter) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src/lib.rs')
| -rw-r--r-- | compiler/rustc_errors/src/lib.rs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs index 73cda64f1cc..052d9b3a783 100644 --- a/compiler/rustc_errors/src/lib.rs +++ b/compiler/rustc_errors/src/lib.rs @@ -37,12 +37,9 @@ extern crate self as rustc_errors; pub use codes::*; pub use diagnostic::{ - AddToDiagnostic, DecorateLint, Diagnostic, DiagnosticArg, DiagnosticArgName, - DiagnosticArgValue, DiagnosticStyledString, IntoDiagnosticArg, StringPart, SubDiagnostic, - SubdiagnosticMessageOp, -}; -pub use diagnostic_builder::{ - BugAbort, DiagnosticBuilder, EmissionGuarantee, FatalAbort, IntoDiagnostic, + AddToDiagnostic, BugAbort, DecorateLint, Diagnostic, DiagnosticArg, DiagnosticArgName, + DiagnosticArgValue, DiagnosticBuilder, DiagnosticStyledString, EmissionGuarantee, FatalAbort, + IntoDiagnostic, IntoDiagnosticArg, StringPart, SubDiagnostic, SubdiagnosticMessageOp, }; pub use diagnostic_impls::{ DiagnosticArgFromDisplay, DiagnosticSymbolList, ExpectedLifetimeParameter, @@ -87,7 +84,6 @@ use Level::*; pub mod annotate_snippet_emitter_writer; pub mod codes; mod diagnostic; -mod diagnostic_builder; mod diagnostic_impls; pub mod emitter; pub mod error; |