Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 36 insertions, 0 deletions

diff --git a/tests/ui/lint/reasons.stderr b/tests/ui/lint/reasons.stderr
new file mode 100644
index 000000000..cd8412153
--- /dev/null
+++ b/tests/ui/lint/reasons.stderr
@@ -0,0 +1,36 @@
+warning: hidden lifetime parameters in types are deprecated
+  --> $DIR/reasons.rs:20:34
+   |
+LL |     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+   |                             -----^^^^^^^^^
+   |                             |
+   |                             expected lifetime parameter
+   |
+   = note: explicit anonymous lifetimes aid reasoning about ownership
+note: the lint level is defined here
+  --> $DIR/reasons.rs:4:9
+   |
+LL | #![warn(elided_lifetimes_in_paths,
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^
+help: indicate the anonymous lifetime
+   |
+LL |     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+   |                                           ++++
+
+warning: variable `Social_exchange_psychology` should have a snake case name
+  --> $DIR/reasons.rs:30:9
+   |
+LL |     let Social_exchange_psychology = CheaterDetectionMechanism {};
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^ help: convert the identifier to snake case (notice the capitalization): `social_exchange_psychology`
+   |
+   = note: people shouldn't have to change their usual style habits
+           to contribute to our project
+note: the lint level is defined here
+  --> $DIR/reasons.rs:8:5
+   |
+LL |     nonstandard_style,
+   |     ^^^^^^^^^^^^^^^^^
+   = note: `#[warn(non_snake_case)]` implied by `#[warn(nonstandard_style)]`
+
+warning: 2 warnings emitted
+