Merge commit '7ea7cd165ad6705603852771bf82cc2fd6560db5' into clippyup2

[rust.git] / tests / ui / option_option.stderr

diff --git a/tests/ui/option_option.stderr b/tests/ui/option_option.stderr
index 4341857cce007c0db6b517966b0e955e2f9f85e4..0cd4c96eb4f9a17988b9cc86bbd0c71c5ba42353 100644 (file)
--- a/tests/ui/option_option.stderr
+++ b/tests/ui/option_option.stderr
@@ -1,58 +1,68 @@
 error: consider using `Option<T>` instead of `Option<Option<T>>` or a custom enum if you need to distinguish all 3 cases
- --> $DIR/option_option.rs:1:13
-  |
-1 | fn input(_: Option<Option<u8>>) {
-  |             ^^^^^^^^^^^^^^^^^^
-  |
-  = note: `-D clippy::option-option` implied by `-D warnings`
+  --> $DIR/option_option.rs:3:13
+   |
+LL | fn input(_: Option<Option<u8>>) {}
+   |             ^^^^^^^^^^^^^^^^^^
+   |
+note: the lint level is defined here
+  --> $DIR/option_option.rs:1:9
+   |
+LL | #![deny(clippy::option_option)]
+   |         ^^^^^^^^^^^^^^^^^^^^^
 
 error: consider using `Option<T>` instead of `Option<Option<T>>` or a custom enum if you need to distinguish all 3 cases
- --> $DIR/option_option.rs:4:16
-  |
-4 | fn output() -> Option<Option<u8>> {
-  |                ^^^^^^^^^^^^^^^^^^
+  --> $DIR/option_option.rs:5:16
+   |
+LL | fn output() -> Option<Option<u8>> {
+   |                ^^^^^^^^^^^^^^^^^^
 
 error: consider using `Option<T>` instead of `Option<Option<T>>` or a custom enum if you need to distinguish all 3 cases
- --> $DIR/option_option.rs:8:27
-  |
-8 | fn output_nested() -> Vec<Option<Option<u8>>> {
-  |                           ^^^^^^^^^^^^^^^^^^
+  --> $DIR/option_option.rs:9:27
+   |
+LL | fn output_nested() -> Vec<Option<Option<u8>>> {
+   |                           ^^^^^^^^^^^^^^^^^^
 
 error: consider using `Option<T>` instead of `Option<Option<T>>` or a custom enum if you need to distinguish all 3 cases
-  --> $DIR/option_option.rs:13:30
+  --> $DIR/option_option.rs:14:30
    |
-13 | fn output_nested_nested() -> Option<Option<Option<u8>>> {
+LL | fn output_nested_nested() -> Option<Option<Option<u8>>> {
    |                              ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: consider using `Option<T>` instead of `Option<Option<T>>` or a custom enum if you need to distinguish all 3 cases
-  --> $DIR/option_option.rs:18:8
+  --> $DIR/option_option.rs:19:8
    |
-18 |     x: Option<Option<u8>>,
+LL |     x: Option<Option<u8>>,
    |        ^^^^^^^^^^^^^^^^^^
 
 error: consider using `Option<T>` instead of `Option<Option<T>>` or a custom enum if you need to distinguish all 3 cases
-  --> $DIR/option_option.rs:22:23
+  --> $DIR/option_option.rs:23:23
    |
-22 |     fn struct_fn() -> Option<Option<u8>> {
+LL |     fn struct_fn() -> Option<Option<u8>> {
    |                       ^^^^^^^^^^^^^^^^^^
 
 error: consider using `Option<T>` instead of `Option<Option<T>>` or a custom enum if you need to distinguish all 3 cases
-  --> $DIR/option_option.rs:28:22
+  --> $DIR/option_option.rs:29:22
    |
-28 |     fn trait_fn() -> Option<Option<u8>>;
+LL |     fn trait_fn() -> Option<Option<u8>>;
    |                      ^^^^^^^^^^^^^^^^^^
 
 error: consider using `Option<T>` instead of `Option<Option<T>>` or a custom enum if you need to distinguish all 3 cases
-  --> $DIR/option_option.rs:32:11
+  --> $DIR/option_option.rs:33:11
    |
-32 |     Tuple(Option<Option<u8>>),
+LL |     Tuple(Option<Option<u8>>),
    |           ^^^^^^^^^^^^^^^^^^
 
 error: consider using `Option<T>` instead of `Option<Option<T>>` or a custom enum if you need to distinguish all 3 cases
-  --> $DIR/option_option.rs:33:15
+  --> $DIR/option_option.rs:34:17
+   |
+LL |     Struct { x: Option<Option<u8>> },
+   |                 ^^^^^^^^^^^^^^^^^^
+
+error: consider using `Option<T>` instead of `Option<Option<T>>` or a custom enum if you need to distinguish all 3 cases
+  --> $DIR/option_option.rs:77:14
    |
-33 |     Struct{x: Option<Option<u8>>},
-   |               ^^^^^^^^^^^^^^^^^^
+LL |         foo: Option<Option<Cow<'a, str>>>,
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to 9 previous errors
+error: aborting due to 10 previous errors