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

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: #4298

changelog: none
This commit is contained in:
bors 2020-11-10 22:39:10 +00:00
commit d0858d0f36
2 changed files with 1 additions and 3 deletions

View File

@ -72,8 +72,6 @@ struct Foo<'a> {
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
#[serde(default)] #[serde(default)]
#[serde(borrow)] #[serde(borrow)]
// FIXME: should not lint here
#[allow(clippy::option_option)]
foo: Option<Option<Cow<'a, str>>>, foo: Option<Option<Cow<'a, str>>>,
} }

View File

@ -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 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>>>, LL | foo: Option<Option<Cow<'a, str>>>,
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^