diff options
| author | bors <bors@rust-lang.org> | 2023-03-20 14:36:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-20 14:36:49 +0000 |
| commit | 8460ca823e8367a30dda430efda790588b8c84d3 (patch) | |
| tree | 1e32b07304207ef4353c452da4bca3cbc7fba53d /compiler/rustc_lint/src/lints.rs | |
| parent | 2c8cc343237b8f7d5a3c3703e3a87f2eb2c54a74 (diff) | |
| parent | 51bdb0f085d02aeab0adbf4b497afc22d6b26f3f (diff) | |
| download | rust-1.68.1.tar.gz rust-1.68.1.zip | |
Auto merge of #109335 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum 1.68.1
[stable] 1.68.1 release This packages up a set of release notes, version bump, and backports of: * Don't eagerly convert principal to string #108162 * Revert "enable ThinLTO for rustc on x86_64-pc-windows-msvc dist builds" #109094 * Create dirs for build_triple #109111 * Fix linker detection for clang with prefix #109156 * ci: use apt install --download-only for solaris debs #108951 The last of those is not yet stable-accepted but I expect it to be, we will drop it and rebuild artifacts if we don't actually approve it. r? `@Mark-Simulacrum`
Diffstat (limited to 'compiler/rustc_lint/src/lints.rs')
| -rw-r--r-- | compiler/rustc_lint/src/lints.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/rustc_lint/src/lints.rs b/compiler/rustc_lint/src/lints.rs index c997d8945d1..329ece28ef8 100644 --- a/compiler/rustc_lint/src/lints.rs +++ b/compiler/rustc_lint/src/lints.rs @@ -8,7 +8,7 @@ use rustc_errors::{ }; use rustc_hir::def_id::DefId; use rustc_macros::{LintDiagnostic, Subdiagnostic}; -use rustc_middle::ty::{Predicate, Ty, TyCtxt}; +use rustc_middle::ty::{PolyExistentialTraitRef, Predicate, Ty, TyCtxt}; use rustc_session::parse::ParseSess; use rustc_span::{edition::Edition, sym, symbol::Ident, Span, Symbol}; @@ -556,8 +556,7 @@ pub struct BuiltinUnexpectedCliConfigValue { #[diag(lint_supertrait_as_deref_target)] pub struct SupertraitAsDerefTarget<'a> { pub t: Ty<'a>, - pub target_principal: String, - // pub target_principal: Binder<'a, ExistentialTraitRef<'b>>, + pub target_principal: PolyExistentialTraitRef<'a>, #[subdiagnostic] pub label: Option<SupertraitAsDerefTargetLabel>, } |
