diff options
| author | bors <bors@rust-lang.org> | 2023-06-02 07:57:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-06-02 07:57:21 +0000 |
| commit | 8ebf04225d358efe77b822081cebef657f88d35b (patch) | |
| tree | 807d30f8b7320a1278878c0a7358b358d9eeca66 /compiler/rustc_errors/src/lib.rs | |
| parent | 33c3d101280c8eb3cd8af421bfb56a8afcc3881d (diff) | |
| parent | ebb7f642e46f2f95ab9c1c82e5a7640876bf2776 (diff) | |
| download | rust-8ebf04225d358efe77b822081cebef657f88d35b.tar.gz rust-8ebf04225d358efe77b822081cebef657f88d35b.zip | |
Auto merge of #112198 - compiler-errors:rollup-o2xe4of, r=compiler-errors
Rollup of 7 pull requests Successful merges: - #111670 (Require that const param tys implement `ConstParamTy`) - #111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…) - #112030 (Migrate `item_trait_alias` to Askama) - #112150 (Support 128-bit atomics on all x86_64 Apple targets) - #112174 (Fix broken link) - #112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.) - #112193 (Check tuple elements are `Sized` in `offset_of`) Failed merges: - #112071 (Group rfcs tests) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src/lib.rs')
| -rw-r--r-- | compiler/rustc_errors/src/lib.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs index 6c5f3e62454..bf77ed81f9b 100644 --- a/compiler/rustc_errors/src/lib.rs +++ b/compiler/rustc_errors/src/lib.rs @@ -6,7 +6,6 @@ #![feature(array_windows)] #![feature(drain_filter)] #![feature(if_let_guard)] -#![feature(adt_const_params)] #![feature(let_chains)] #![feature(never_type)] #![feature(result_option_inspect)] @@ -845,7 +844,7 @@ impl Handler { &self, msg: impl Into<DiagnosticMessage>, ) -> DiagnosticBuilder<'_, ErrorGuaranteed> { - DiagnosticBuilder::new_guaranteeing_error::<_, { Level::Error { lint: false } }>(self, msg) + DiagnosticBuilder::new_guaranteeing_error(self, msg) } /// This should only be used by `rustc_middle::lint::struct_lint_level`. Do not use it for hard errors. |