Skip to content

Commit 63cc785

Browse files
committed
Auto merge of #152213 - JonathanBrouwer:rollup-trjCgZZ, r=JonathanBrouwer
Rollup of 13 pull requests Successful merges: - rust-lang/rust#152191 (Convert to inline diagnostics in `rustc_hir_analysis`) - rust-lang/rust#149329 (Mark match arms in try and for as being from desugarings.) - rust-lang/rust#151474 (Minor structural improvements) - rust-lang/rust#152107 (Convert to inline diagnostics in `rustc_borrowck`) - rust-lang/rust#152117 (Convert to inline diagnostics in `rustc_trait_selection`) - rust-lang/rust#152136 (Consolidate type const checks on `tcx.is_type_const`) - rust-lang/rust#152140 (Hard code the error code registry for custom drivers) - rust-lang/rust#152155 (Fix typos in riscv64a23-unknown-linux-gnu.md) - rust-lang/rust#152170 (Port `rustc_effective_visibility` to the new attribute parser) - rust-lang/rust#152182 (update compiler stable backport zulip msg) - rust-lang/rust#152184 (Port rustc_abi to the attribute parser) - rust-lang/rust#152195 (update openmp/offload builds to LLVM 22, Part 1) - rust-lang/rust#152202 (chore: clearify tidy's error message) Failed merges: - rust-lang/rust#151744 (fix refining_impl_trait suggestion with return_type_notation) - rust-lang/rust#152212 (Port some attributes to the attr parser)
2 parents 6e0ecff + 3a3ee8c commit 63cc785

2 files changed

Lines changed: 1 addition & 6 deletions

File tree

examples/rustc-interface-example.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44

55
extern crate rustc_driver;
66
extern crate rustc_error_codes;
7-
extern crate rustc_errors;
87
extern crate rustc_hash;
98
extern crate rustc_hir;
109
extern crate rustc_interface;
1110
extern crate rustc_session;
1211
extern crate rustc_span;
1312

14-
use rustc_errors::registry;
1513
use rustc_hash::FxHashMap;
1614
use rustc_session::config;
1715

@@ -50,8 +48,6 @@ fn main() {
5048
//
5149
// The second parameter is local providers and the third parameter is external providers.
5250
override_queries: None, // Option<fn(&Session, &mut ty::query::Providers<'_>, &mut ty::query::Providers<'_>)>
53-
// Registry of diagnostics codes.
54-
registry: registry::Registry::new(rustc_errors::codes::DIAGNOSTICS),
5551
make_codegen_backend: None,
5652
expanded_args: Vec::new(),
5753
ice_file: None,

examples/rustc-interface-getting-diagnostics.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ extern crate rustc_span;
1515
use std::sync::{Arc, Mutex};
1616

1717
use rustc_errors::emitter::Emitter;
18-
use rustc_errors::registry::{self, Registry};
18+
use rustc_errors::registry::Registry;
1919
use rustc_errors::translation::Translate;
2020
use rustc_errors::{DiagInner, FluentBundle};
2121
use rustc_session::config;
@@ -76,7 +76,6 @@ fn main() {
7676
})),
7777
register_lints: None,
7878
override_queries: None,
79-
registry: registry::Registry::new(rustc_errors::codes::DIAGNOSTICS),
8079
make_codegen_backend: None,
8180
expanded_args: Vec::new(),
8281
ice_file: None,

0 commit comments

Comments
 (0)