about summary refs log tree commit diff
path: root/compiler/rustc_lint/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-01-30 10:30:42 +0000
committerbors <bors@rust-lang.org>2022-01-30 10:30:42 +0000
commit7cc28c128be0363d83accf318b87b40ba6168384 (patch)
tree54f478e686227f316669078b0f9969ca744a874c /compiler/rustc_lint/src
parenta00e130dae74a213338e2b095ec855156d8f3d8a (diff)
parent9f6d0cb052e7d06685a851b0776b63dfe5883c9c (diff)
downloadrust-7cc28c128be0363d83accf318b87b40ba6168384.tar.gz
rust-7cc28c128be0363d83accf318b87b40ba6168384.zip
Auto merge of #93468 - matthiaskrgr:rollup-vxullvd, r=matthiaskrgr
Rollup of 8 pull requests

Successful merges:

 - #93256 (Make `join!` description more accurate)
 - #93358 (Add note suggesting that predicate may be satisfied, but is not `const`)
 - #93362 (Do not register infer var for GAT projection in RPIT)
 - #93391 (rustdoc: remove tooltip from source link)
 - #93414 (Move unstable is_{arch}_feature_detected! macros to std::arch)
 - #93441 (rustdoc: load the set of in-scope traits for modules with no docstring)
 - #93459 (fs: Don't copy d_name from struct dirent)
 - #93463 (Rename _args -> args in format_args expansion)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_lint/src')
-rw-r--r--compiler/rustc_lint/src/traits.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_lint/src/traits.rs b/compiler/rustc_lint/src/traits.rs
index dafff640b36..4c7f3482776 100644
--- a/compiler/rustc_lint/src/traits.rs
+++ b/compiler/rustc_lint/src/traits.rs
@@ -86,7 +86,6 @@ declare_lint_pass!(
 
 impl<'tcx> LateLintPass<'tcx> for DropTraitConstraints {
     fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx hir::Item<'tcx>) {
-        use rustc_middle::ty;
         use rustc_middle::ty::PredicateKind::*;
 
         let predicates = cx.tcx.explicit_predicates_of(item.def_id);
@@ -94,7 +93,7 @@ impl<'tcx> LateLintPass<'tcx> for DropTraitConstraints {
             let Trait(trait_predicate) = predicate.kind().skip_binder() else {
                 continue
             };
-            if trait_predicate.constness == ty::BoundConstness::ConstIfConst {
+            if trait_predicate.is_const_if_const() {
                 // `~const Drop` definitely have meanings so avoid linting here.
                 continue;
             }