Skip to content

Commit

Permalink
Auto merge of rust-lang#4118 - rust-lang:revert, r=phansch
Browse files Browse the repository at this point in the history
Revert "Turn off two tests broken due to rust-lang#4108"

This reverts commit 568a3ec which is unnecessary after rust-lang/rust-clippy#4115

changelog: none
  • Loading branch information
bors committed May 20, 2019
2 parents fd56381 + efac2e5 commit 2cc23a5
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
3 changes: 0 additions & 3 deletions tests/ui/crashes/used_underscore_binding_macro.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// run-pass

// FIXME(#4108)
/*
#![allow(clippy::useless_attribute)] //issue #2910

#[macro_use]
Expand All @@ -19,6 +17,5 @@ struct MacroAttributesTest {
fn macro_attributes_test() {
let _ = MacroAttributesTest { _foo: 0 };
}
*/

fn main() {}
5 changes: 1 addition & 4 deletions tests/ui/serde.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// FIXME(#4108)

/*
#![warn(clippy::serde_api_misuse)]
#![allow(dead_code)]

Expand Down Expand Up @@ -46,5 +43,5 @@ impl<'de> serde::de::Visitor<'de> for B {
unimplemented!()
}
}
*/

fn main() {}
15 changes: 15 additions & 0 deletions tests/ui/serde.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
error: you should not implement `visit_string` without also implementing `visit_str`
--> $DIR/serde.rs:39:5
|
LL | / fn visit_string<E>(self, _v: String) -> Result<Self::Value, E>
LL | | where
LL | | E: serde::de::Error,
LL | | {
LL | | unimplemented!()
LL | | }
| |_____^
|
= note: `-D clippy::serde-api-misuse` implied by `-D warnings`

error: aborting due to previous error

0 comments on commit 2cc23a5

Please sign in to comment.