Remove `let_underscore_must_use`

The `let_underscore_must_use` lint was really only added because clippy
included it, but it doesn't actually seem very useful.

diff --git a/compiler/rustc_lint/src/let_underscore.rs b/compiler/rustc_lint/src/let_underscore.rs
index 2ad09312d9d56e593fc40e7e807b8affb30e85cf..dea878c4460b963dfd851e8be75c7843e3cd9512 100644 (file)
--- a/compiler/rustc_lint/src/let_underscore.rs
+++ b/compiler/rustc_lint/src/let_underscore.rs
@@ -1,10 +1,7 @@
 use crate::{LateContext, LateLintPass, LintContext};
 use rustc_errors::Applicability;
 use rustc_hir as hir;
-use rustc_middle::{
-    lint::LintDiagnosticBuilder,
-    ty::{self, Ty},
-};
+use rustc_middle::{lint::LintDiagnosticBuilder, ty};
 use rustc_span::Symbol;
 
 declare_lint! {
@@ -87,32 +84,7 @@
     "non-binding let on a synchronization lock"
 }
 
-declare_lint! {
-    /// The `let_underscore_must_use` lint checks for statements which don't bind
-    /// a `must_use` expression to anything, causing the lock to be released
-    /// immediately instead of at end of scope, which is typically incorrect.
-    ///
-    /// ### Example
-    /// ```rust
-    /// #[must_use]
-    /// struct SomeStruct;
-    ///
-    /// fn main() {
-    ///     // SomeStuct is dropped immediately instead of at end of scope.
-    ///     let _ = SomeStruct;
-    /// }
-    /// ```
-    /// ### Explanation
-    ///
-    /// Statements which assign an expression to an underscore causes the
-    /// expression to immediately drop. Usually, it's better to explicitly handle
-    /// the `must_use` expression.
-    pub LET_UNDERSCORE_MUST_USE,
-    Allow,
-    "non-binding let on a expression marked `must_use`"
-}
-
-declare_lint_pass!(LetUnderscore => [LET_UNDERSCORE_DROP, LET_UNDERSCORE_LOCK, LET_UNDERSCORE_MUST_USE]);
+declare_lint_pass!(LetUnderscore => [LET_UNDERSCORE_DROP, LET_UNDERSCORE_LOCK]);
 
 const SYNC_GUARD_SYMBOLS: [Symbol; 3] = [
     rustc_span::sym::MutexGuard,
@@ -138,8 +110,6 @@ fn check_local(&mut self, cx: &LateContext<'_>, local: &hir::Local<'_>) {
                     .any(|guard_symbol| cx.tcx.is_diagnostic_item(*guard_symbol, adt.did())),
                 _ => false,
             };
-            let is_must_use_ty = is_must_use_ty(cx, cx.typeck_results().expr_ty(init));
-            let is_must_use_func_call = is_must_use_func_call(cx, init);
 
             if is_sync_lock {
                 cx.struct_span_lint(LET_UNDERSCORE_LOCK, local.span, |lint| {
@@ -150,15 +120,6 @@ fn check_local(&mut self, cx: &LateContext<'_>, local: &hir::Local<'_>) {
                         "non-binding let on a synchronization lock",
                     )
                 })
-            } else if is_must_use_ty || is_must_use_func_call {
-                cx.struct_span_lint(LET_UNDERSCORE_MUST_USE, local.span, |lint| {
-                    build_and_emit_lint(
-                        lint,
-                        local,
-                        init.span,
-                        "non-binding let on a expression marked `must_use`",
-                    );
-                })
             } else {
                 cx.struct_span_lint(LET_UNDERSCORE_DROP, local.span, |lint| {
                     build_and_emit_lint(
@@ -194,65 +155,3 @@ fn build_and_emit_lint(
         )
         .emit();
 }
-
-// return true if `ty` is a type that is marked as `must_use`
-fn is_must_use_ty<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> bool {
-    match ty.kind() {
-        ty::Adt(adt, _) => has_must_use_attr(cx, adt.did()),
-        ty::Foreign(ref did) => has_must_use_attr(cx, *did),
-        ty::Slice(ty)
-        | ty::Array(ty, _)
-        | ty::RawPtr(ty::TypeAndMut { ty, .. })
-        | ty::Ref(_, ty, _) => {
-            // for the Array case we don't need to care for the len == 0 case
-            // because we don't want to lint functions returning empty arrays
-            is_must_use_ty(cx, *ty)
-        }
-        ty::Tuple(substs) => substs.iter().any(|ty| is_must_use_ty(cx, ty)),
-        ty::Opaque(ref def_id, _) => {
-            for (predicate, _) in cx.tcx.explicit_item_bounds(*def_id) {
-                if let ty::PredicateKind::Trait(trait_predicate) = predicate.kind().skip_binder() {
-                    if has_must_use_attr(cx, trait_predicate.trait_ref.def_id) {
-                        return true;
-                    }
-                }
-            }
-            false
-        }
-        ty::Dynamic(binder, _) => {
-            for predicate in binder.iter() {
-                if let ty::ExistentialPredicate::Trait(ref trait_ref) = predicate.skip_binder() {
-                    if has_must_use_attr(cx, trait_ref.def_id) {
-                        return true;
-                    }
-                }
-            }
-            false
-        }
-        _ => false,
-    }
-}
-
-// check if expr is calling method or function with #[must_use] attribute
-fn is_must_use_func_call(cx: &LateContext<'_>, expr: &hir::Expr<'_>) -> bool {
-    let did = match expr.kind {
-                hir::ExprKind::Call(path, _) if let hir::ExprKind::Path(ref qpath) = path.kind => {
-                    if let hir::def::Res::Def(_, did) = cx.qpath_res(qpath, path.hir_id) {
-                        Some(did)
-                    } else {
-                        None
-                    }
-                },
-                hir::ExprKind::MethodCall(..) => {
-                    cx.typeck_results().type_dependent_def_id(expr.hir_id)
-                }
-                _ => None,
-            };
-
-    did.map_or(false, |did| has_must_use_attr(cx, did))
-}
-
-// returns true if DefId contains a `#[must_use]` attribute
-fn has_must_use_attr(cx: &LateContext<'_>, did: hir::def_id::DefId) -> bool {
-    cx.tcx.has_attr(did, rustc_span::sym::must_use)
-}

diff --git a/compiler/rustc_lint/src/lib.rs b/compiler/rustc_lint/src/lib.rs
index 4359a54b698dc9dffe6e494bbbe12800a2c76b99..79661c0fefe8d4305a84da6c9f1664a9bbdc0650 100644 (file)
--- a/compiler/rustc_lint/src/lib.rs
+++ b/compiler/rustc_lint/src/lib.rs
@@ -317,12 +317,7 @@ macro_rules! register_passes {
         REDUNDANT_SEMICOLONS
     );
 
-    add_lint_group!(
-        "let_underscore",
-        LET_UNDERSCORE_DROP,
-        LET_UNDERSCORE_LOCK,
-        LET_UNDERSCORE_MUST_USE
-    );
+    add_lint_group!("let_underscore", LET_UNDERSCORE_DROP, LET_UNDERSCORE_LOCK);
 
     add_lint_group!(
         "rust_2018_idioms",

diff --git a/src/test/ui/lint/let_underscore/let_underscore_must_use.rs b/src/test/ui/lint/let_underscore/let_underscore_must_use.rs
deleted file mode 100644 (file)
index 3f79dc7..0000000
--- a/src/test/ui/lint/let_underscore/let_underscore_must_use.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// check-pass
-// compile-flags: -W let_underscore_must_use
-
-#[must_use]
-struct MustUseType;
-
-#[must_use]
-fn must_use_function() -> () {}
-
-fn main() {
-    let _ = MustUseType; //~WARNING non-binding let on a expression marked `must_use`
-    let _ = must_use_function(); //~WARNING non-binding let on a expression marked `must_use`
-}

diff --git a/src/test/ui/lint/let_underscore/let_underscore_must_use.stderr b/src/test/ui/lint/let_underscore/let_underscore_must_use.stderr
deleted file mode 100644 (file)
index 959572e..0000000
--- a/src/test/ui/lint/let_underscore/let_underscore_must_use.stderr
+++ /dev/null
@@ -1,33 +0,0 @@
-warning: non-binding let on a expression marked `must_use`
-  --> $DIR/let_underscore_must_use.rs:11:5
-   |
-LL |     let _ = MustUseType;
-   |     ^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: requested on the command line with `-W let-underscore-must-use`
-help: consider binding to an unused variable
-   |
-LL |     let _unused = MustUseType;
-   |         ~~~~~~~
-help: consider explicitly droping with `std::mem::drop`
-   |
-LL |     let _ = drop(...);
-   |             ~~~~~~~~~
-
-warning: non-binding let on a expression marked `must_use`
-  --> $DIR/let_underscore_must_use.rs:12:5
-   |
-LL |     let _ = must_use_function();
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-help: consider binding to an unused variable
-   |
-LL |     let _unused = must_use_function();
-   |         ~~~~~~~
-help: consider explicitly droping with `std::mem::drop`
-   |
-LL |     let _ = drop(...);
-   |             ~~~~~~~~~
-
-warning: 2 warnings emitted
-