diff options
| author | bors <bors@rust-lang.org> | 2020-11-10 22:39:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-11-10 22:39:10 +0000 |
| commit | d0858d0f36cc43c348a2da73a68b5931b37b82d5 (patch) | |
| tree | a19f8740574fe061ca999c3eb23f8b80b95e4328 | |
| parent | 467bf95ab7822d4cd83b514d6c550bf2392eb7d0 (diff) | |
| parent | 8242b2f0a4a53f066fa579d7497ae4574e291e2e (diff) | |
| download | rust-d0858d0f36cc43c348a2da73a68b5931b37b82d5.tar.gz rust-d0858d0f36cc43c348a2da73a68b5931b37b82d5.zip | |
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
| -rw-r--r-- | tests/ui/option_option.rs | 2 | ||||
| -rw-r--r-- | tests/ui/option_option.stderr | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/ui/option_option.rs b/tests/ui/option_option.rs index a2617a13eca..24344833641 100644 --- 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 index 0cd4c96eb4f..8ae1d23a8e3 100644 --- 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>>>, | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |