Skip to content

Commit 2cc23a5

Browse files
committed
Auto merge of #4118 - rust-lang:revert, r=phansch
Revert "Turn off two tests broken due to #4108" This reverts commit 568a3ec which is unnecessary after #4115 changelog: none
2 parents fd56381 + efac2e5 commit 2cc23a5

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

tests/ui/crashes/used_underscore_binding_macro.rs

-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// run-pass
22

3-
// FIXME(#4108)
4-
/*
53
#![allow(clippy::useless_attribute)] //issue #2910
64

75
#[macro_use]
@@ -19,6 +17,5 @@ struct MacroAttributesTest {
1917
fn macro_attributes_test() {
2018
let _ = MacroAttributesTest { _foo: 0 };
2119
}
22-
*/
2320

2421
fn main() {}

tests/ui/serde.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// FIXME(#4108)
2-
3-
/*
41
#![warn(clippy::serde_api_misuse)]
52
#![allow(dead_code)]
63

@@ -46,5 +43,5 @@ impl<'de> serde::de::Visitor<'de> for B {
4643
unimplemented!()
4744
}
4845
}
49-
*/
46+
5047
fn main() {}

tests/ui/serde.stderr

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
error: you should not implement `visit_string` without also implementing `visit_str`
2+
--> $DIR/serde.rs:39:5
3+
|
4+
LL | / fn visit_string<E>(self, _v: String) -> Result<Self::Value, E>
5+
LL | | where
6+
LL | | E: serde::de::Error,
7+
LL | | {
8+
LL | | unimplemented!()
9+
LL | | }
10+
| |_____^
11+
|
12+
= note: `-D clippy::serde-api-misuse` implied by `-D warnings`
13+
14+
error: aborting due to previous error
15+

0 commit comments

Comments
 (0)