Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 62 deletions

diff --git a/src/test/ui/lint/lint-non-snake-case-functions.stderr b/src/test/ui/lint/lint-non-snake-case-functions.stderr
deleted file mode 100644
index f6ac6b99b..000000000
--- a/src/test/ui/lint/lint-non-snake-case-functions.stderr
+++ /dev/null
@@ -1,62 +0,0 @@
-error: method `Foo_Method` should have a snake case name
-  --> $DIR/lint-non-snake-case-functions.rs:7:8
-   |
-LL |     fn Foo_Method() {}
-   |        ^^^^^^^^^^ help: convert the identifier to snake case: `foo_method`
-   |
-note: the lint level is defined here
-  --> $DIR/lint-non-snake-case-functions.rs:1:9
-   |
-LL | #![deny(non_snake_case)]
-   |         ^^^^^^^^^^^^^^
-
-error: method `foo__method` should have a snake case name
-  --> $DIR/lint-non-snake-case-functions.rs:11:8
-   |
-LL |     fn foo__method(&self) {}
-   |        ^^^^^^^^^^^ help: convert the identifier to snake case: `foo_method`
-
-error: method `xyZ` should have a snake case name
-  --> $DIR/lint-non-snake-case-functions.rs:14:12
-   |
-LL |     pub fn xyZ(&mut self) {}
-   |            ^^^ help: convert the identifier to snake case: `xy_z`
-
-error: method `render_HTML` should have a snake case name
-  --> $DIR/lint-non-snake-case-functions.rs:17:8
-   |
-LL |     fn render_HTML() {}
-   |        ^^^^^^^^^^^ help: convert the identifier to snake case: `render_html`
-
-error: trait method `ABC` should have a snake case name
-  --> $DIR/lint-non-snake-case-functions.rs:22:8
-   |
-LL |     fn ABC();
-   |        ^^^ help: convert the identifier to snake case: `abc`
-
-error: trait method `a_b_C` should have a snake case name
-  --> $DIR/lint-non-snake-case-functions.rs:25:8
-   |
-LL |     fn a_b_C(&self) {}
-   |        ^^^^^ help: convert the identifier to snake case (notice the capitalization): `a_b_c`
-
-error: trait method `something__else` should have a snake case name
-  --> $DIR/lint-non-snake-case-functions.rs:28:8
-   |
-LL |     fn something__else(&mut self);
-   |        ^^^^^^^^^^^^^^^ help: convert the identifier to snake case: `something_else`
-
-error: function `Cookie` should have a snake case name
-  --> $DIR/lint-non-snake-case-functions.rs:38:4
-   |
-LL | fn Cookie() {}
-   |    ^^^^^^ help: convert the identifier to snake case (notice the capitalization): `cookie`
-
-error: function `bi_S_Cuit` should have a snake case name
-  --> $DIR/lint-non-snake-case-functions.rs:41:8
-   |
-LL | pub fn bi_S_Cuit() {}
-   |        ^^^^^^^^^ help: convert the identifier to snake case (notice the capitalization): `bi_s_cuit`
-
-error: aborting due to 9 previous errors
-