Skip to content

Commit

Permalink
Auto merge of #6303 - ThibsG:OptionOptionSerde, r=ebroto
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Nov 10, 2020
2 parents 467bf95 + 8242b2f commit 6b2fe93
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions tests/ui/option_option.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>>>,
}

Expand Down
2 changes: 1 addition & 1 deletion tests/ui/option_option.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -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>>>,
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down

0 comments on commit 6b2fe93

Please sign in to comment.