Auto merge of rust-lang#6303 - ThibsG:OptionOptionSerde, r=ebroto

bors · bors · commit d0858d0f36cc · 2020-11-10T22:39:10.000Z
Remove `allow` in `option_option` lint test As it is not triggering locally anymore, I propose to remove `#[allow(clippy::option_option)]` from the test. The goal is also to see what happens on CI. closes: rust-lang#4298 changelog: none
diff --git a/tests/ui/option_option.rs b/tests/ui/option_option.rs
@@ -72,8 +72,6 @@ mod issue_4298 {
         #[serde(skip_serializing_if = "Option::is_none")]
         #[serde(default)]
         #[serde(borrow)]
-        // FIXME: should not lint here
-        #[allow(clippy::option_option)]
         foo: Option<Option<Cow<'a, str>>>,
     }
 
diff --git a/tests/ui/option_option.stderr b/tests/ui/option_option.stderr
@@ -59,7 +59,7 @@ 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
+  --> $DIR/option_option.rs:75:14
    |
 LL |         foo: Option<Option<Cow<'a, str>>>,
    |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,6 @@ mod issue_4298 {`
`72`	`72`	`#[serde(skip_serializing_if = "Option::is_none")]`
`73`	`73`	`#[serde(default)]`
`74`	`74`	`#[serde(borrow)]`
`75`		`- // FIXME: should not lint here`
`76`		`- #[allow(clippy::option_option)]`
`77`	`75`	`foo: Option<Option<Cow<'a, str>>>,`
`78`	`76`	`}`
`79`	`77`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ LL \| Struct { x: Option<Option<u8>> },`
`59`	`59`	`\| ^^^^^^^^^^^^^^^^^^`
`60`	`60`
`61`	`61`	error: consider using `Option<T>` instead of `Option<Option<T>>` or a custom enum if you need to distinguish all 3 cases
`62`		`- --> $DIR/option_option.rs:77:14`
	`62`	`+ --> $DIR/option_option.rs:75:14`
`63`	`63`	`\|`
`64`	`64`	`LL \| foo: Option<Option<Cow<'a, str>>>,`
`65`	`65`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^`