diff --git a/Cargo.toml b/Cargo.toml index 96eb3fac3c3..f830aeabe6f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,15 +32,15 @@ test = false # begin automatic update clippy_lints = { version = "0.0.131", path = "clippy_lints" } # end automatic update -cargo_metadata = "0.1.1" +cargo_metadata = "0.2" [dev-dependencies] compiletest_rs = "0.2.5" -lazy_static = "0.1.15" +lazy_static = "0.2" regex = "0.2" -serde_derive = "0.9.1" +serde_derive = "1.0" clippy-mini-macro-test = { version = "0.1", path = "mini-macro" } -serde = "0.9.1" +serde = "1.0" [features] debugging = [] diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs index 29ecf105b65..79c05b5e01a 100644 --- a/clippy_lints/src/lib.rs +++ b/clippy_lints/src/lib.rs @@ -124,7 +124,7 @@ pub mod ranges; pub mod reference; pub mod regex; pub mod returns; -pub mod serde; +pub mod serde_api; pub mod shadow; pub mod should_assert_eq; pub mod strings; @@ -202,7 +202,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) { ); // end deprecated lints, do not remove this comment, it’s used in `update_lints` - reg.register_late_lint_pass(box serde::Serde); + reg.register_late_lint_pass(box serde_api::Serde); reg.register_early_lint_pass(box utils::internal_lints::Clippy); reg.register_late_lint_pass(box utils::internal_lints::LintWithoutLintPass::default()); reg.register_late_lint_pass(box utils::inspector::Pass); diff --git a/clippy_lints/src/serde.rs b/clippy_lints/src/serde_api.rs similarity index 100% rename from clippy_lints/src/serde.rs rename to clippy_lints/src/serde_api.rs diff --git a/tests/ui/serde.rs b/tests/ui/serde.rs index 78aabf352bb..83150638ac1 100644 --- a/tests/ui/serde.rs +++ b/tests/ui/serde.rs @@ -7,7 +7,7 @@ extern crate serde; struct A; -impl serde::de::Visitor for A { +impl<'de> serde::de::Visitor<'de> for A { type Value = (); fn expecting(&self, _: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { @@ -29,7 +29,7 @@ impl serde::de::Visitor for A { struct B; -impl serde::de::Visitor for B { +impl<'de> serde::de::Visitor<'de> for B { type Value = (); fn expecting(&self, _: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {