Merging upstream version 1.76.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 48 insertions, 187 deletions

diff --git a/src/tools/clippy/tests/ui-internal/default_deprecation_reason.stderr b/src/tools/clippy/tests/ui-internal/default_deprecation_reason.stderr
index ca26b649f..595e4c138 100644
--- a/src/tools/clippy/tests/ui-internal/default_deprecation_reason.stderr
+++ b/src/tools/clippy/tests/ui-internal/default_deprecation_reason.stderr
@@ -18,5 +18,5 @@ LL | #![deny(clippy::internal)]
    = note: `#[deny(clippy::default_deprecation_reason)]` implied by `#[deny(clippy::internal)]`
    = note: this error originates in the macro `declare_deprecated_lint` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/src/tools/clippy/tests/ui-internal/default_lint.stderr b/src/tools/clippy/tests/ui-internal/default_lint.stderr
index 8961bd462..ab2470210 100644
--- a/src/tools/clippy/tests/ui-internal/default_lint.stderr
+++ b/src/tools/clippy/tests/ui-internal/default_lint.stderr
@@ -17,5 +17,5 @@ LL | #![deny(clippy::internal)]
    = note: `#[deny(clippy::default_lint)]` implied by `#[deny(clippy::internal)]`
    = note: this error originates in the macro `$crate::declare_tool_lint` which comes from the expansion of the macro `declare_tool_lint` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/src/tools/clippy/tests/ui-internal/disallow_struct_span_lint.rs b/src/tools/clippy/tests/ui-internal/disallow_struct_span_lint.rs
new file mode 100644
index 000000000..3155c0235
--- /dev/null
+++ b/src/tools/clippy/tests/ui-internal/disallow_struct_span_lint.rs
@@ -0,0 +1,27 @@
+#![feature(rustc_private)]
+
+extern crate rustc_errors;
+extern crate rustc_hir;
+extern crate rustc_lint;
+extern crate rustc_middle;
+
+use rustc_errors::{DiagnosticMessage, MultiSpan};
+use rustc_hir::hir_id::HirId;
+use rustc_lint::{Lint, LintContext};
+use rustc_middle::ty::TyCtxt;
+
+pub fn a(cx: impl LintContext, lint: &'static Lint, span: impl Into<MultiSpan>, msg: impl Into<DiagnosticMessage>) {
+    cx.struct_span_lint(lint, span, msg, |b| b);
+}
+
+pub fn b(
+    tcx: TyCtxt<'_>,
+    lint: &'static Lint,
+    hir_id: HirId,
+    span: impl Into<MultiSpan>,
+    msg: impl Into<DiagnosticMessage>,
+) {
+    tcx.struct_span_lint_hir(lint, hir_id, span, msg, |b| b);
+}
+
+fn main() {}
diff --git a/src/tools/clippy/tests/ui-internal/disallow_struct_span_lint.stderr b/src/tools/clippy/tests/ui-internal/disallow_struct_span_lint.stderr
new file mode 100644
index 000000000..76c487fb1
--- /dev/null
+++ b/src/tools/clippy/tests/ui-internal/disallow_struct_span_lint.stderr
@@ -0,0 +1,17 @@
+error: use of a disallowed method `rustc_lint::context::LintContext::struct_span_lint`
+  --> $DIR/disallow_struct_span_lint.rs:14:5
+   |
+LL |     cx.struct_span_lint(lint, span, msg, |b| b);
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: `-D clippy::disallowed-methods` implied by `-D warnings`
+   = help: to override `-D warnings` add `#[allow(clippy::disallowed_methods)]`
+
+error: use of a disallowed method `rustc_middle::ty::context::TyCtxt::struct_span_lint_hir`
+  --> $DIR/disallow_struct_span_lint.rs:24:5
+   |
+LL |     tcx.struct_span_lint_hir(lint, hir_id, span, msg, |b| b);
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 2 previous errors
+
diff --git a/src/tools/clippy/tests/ui-internal/if_chain_style.rs b/src/tools/clippy/tests/ui-internal/if_chain_style.rs
deleted file mode 100644
index b462b20e0..000000000
--- a/src/tools/clippy/tests/ui-internal/if_chain_style.rs
+++ /dev/null
@@ -1,97 +0,0 @@
-#![warn(clippy::if_chain_style)]
-#![allow(
-    clippy::needless_if,
-    clippy::no_effect,
-    clippy::nonminimal_bool,
-    clippy::missing_clippy_version_attribute
-)]
-
-extern crate if_chain;
-
-use if_chain::if_chain;
-
-fn main() {
-    if true {
-        let x = "";
-        // `if_chain!` inside `if`
-        if_chain! {
-            if true;
-            if true;
-            then {}
-        }
-    }
-    if_chain! {
-        if true
-            // multi-line AND'ed conditions
-            && false;
-        if let Some(1) = Some(1);
-        // `let` before `then`
-        let x = "";
-        then {
-            ();
-        }
-    }
-    if_chain! {
-        // single `if` condition
-        if true;
-        then {
-            let x = "";
-            // nested if
-            if true {}
-        }
-    }
-    if_chain! {
-        // starts with `let ..`
-        let x = "";
-        if let Some(1) = Some(1);
-        then {
-            let x = "";
-            let x = "";
-            // nested if_chain!
-            if_chain! {
-                if true;
-                if true;
-                then {}
-            }
-        }
-    }
-}
-
-fn negative() {
-    if true {
-        ();
-        if_chain! {
-            if true;
-            if true;
-            then { (); }
-        }
-    }
-    if_chain! {
-        if true;
-        let x = "";
-        if true;
-        then { (); }
-    }
-    if_chain! {
-        if true;
-        if true;
-        then {
-            if true { 1 } else { 2 }
-        } else {
-            3
-        }
-    };
-    if true {
-        if_chain! {
-            if true;
-            if true;
-            then {}
-        }
-    } else if false {
-        if_chain! {
-            if true;
-            if false;
-            then {}
-        }
-    }
-}
diff --git a/src/tools/clippy/tests/ui-internal/if_chain_style.stderr b/src/tools/clippy/tests/ui-internal/if_chain_style.stderr
deleted file mode 100644
index ea0495532..000000000
--- a/src/tools/clippy/tests/ui-internal/if_chain_style.stderr
+++ /dev/null
@@ -1,86 +0,0 @@
-error: this `if` can be part of the inner `if_chain!`
-  --> $DIR/if_chain_style.rs:14:5
-   |
-LL | /     if true {
-LL | |         let x = "";
-LL | |         // `if_chain!` inside `if`
-LL | |         if_chain! {
-...  |
-LL | |         }
-LL | |     }
-   | |_____^
-   |
-help: this `let` statement can also be in the `if_chain!`
-  --> $DIR/if_chain_style.rs:15:9
-   |
-LL |         let x = "";
-   |         ^^^^^^^^^^^
-   = note: `-D clippy::if-chain-style` implied by `-D warnings`
-   = help: to override `-D warnings` add `#[allow(clippy::if_chain_style)]`
-
-error: `if a && b;` should be `if a; if b;`
-  --> $DIR/if_chain_style.rs:24:12
-   |
-LL |           if true
-   |  ____________^
-LL | |             // multi-line AND'ed conditions
-LL | |             && false;
-   | |____________________^
-
-error: `let` expression should be inside `then { .. }`
-  --> $DIR/if_chain_style.rs:29:9
-   |
-LL |         let x = "";
-   |         ^^^^^^^^^^^
-
-error: this `if` can be part of the outer `if_chain!`
-  --> $DIR/if_chain_style.rs:40:13
-   |
-LL |             if true {}
-   |             ^^^^^^^^^^
-   |
-help: this `let` statement can also be in the `if_chain!`
-  --> $DIR/if_chain_style.rs:38:13
-   |
-LL |             let x = "";
-   |             ^^^^^^^^^^^
-
-error: `if_chain!` only has one `if`
-  --> $DIR/if_chain_style.rs:34:5
-   |
-LL | /     if_chain! {
-LL | |         // single `if` condition
-LL | |         if true;
-LL | |         then {
-...  |
-LL | |         }
-LL | |     }
-   | |_____^
-   |
-   = note: this error originates in the macro `__if_chain` which comes from the expansion of the macro `if_chain` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: `let` expression should be above the `if_chain!`
-  --> $DIR/if_chain_style.rs:45:9
-   |
-LL |         let x = "";
-   |         ^^^^^^^^^^^
-
-error: this `if_chain!` can be merged with the outer `if_chain!`
-  --> $DIR/if_chain_style.rs:51:13
-   |
-LL | /             if_chain! {
-LL | |                 if true;
-LL | |                 if true;
-LL | |                 then {}
-LL | |             }
-   | |_____________^
-   |
-help: these `let` statements can also be in the `if_chain!`
-  --> $DIR/if_chain_style.rs:48:13
-   |
-LL | /             let x = "";
-LL | |             let x = "";
-   | |_______________________^
-
-error: aborting due to 7 previous errors
-
diff --git a/src/tools/clippy/tests/ui-internal/lint_without_lint_pass.stderr b/src/tools/clippy/tests/ui-internal/lint_without_lint_pass.stderr
index de04920b8..de55876b1 100644
--- a/src/tools/clippy/tests/ui-internal/lint_without_lint_pass.stderr
+++ b/src/tools/clippy/tests/ui-internal/lint_without_lint_pass.stderr
@@ -17,5 +17,5 @@ LL | #![deny(clippy::internal)]
    = note: `#[deny(clippy::lint_without_lint_pass)]` implied by `#[deny(clippy::internal)]`
    = note: this error originates in the macro `declare_tool_lint` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/src/tools/clippy/tests/ui-internal/outer_expn_data.stderr b/src/tools/clippy/tests/ui-internal/outer_expn_data.stderr
index e41ace472..0d5b01325 100644
--- a/src/tools/clippy/tests/ui-internal/outer_expn_data.stderr
+++ b/src/tools/clippy/tests/ui-internal/outer_expn_data.stderr
@@ -11,5 +11,5 @@ LL | #![deny(clippy::internal)]
    |         ^^^^^^^^^^^^^^^^
    = note: `#[deny(clippy::outer_expn_expn_data)]` implied by `#[deny(clippy::internal)]`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error