Merge remote-tracking branch 'remotes/origin/master' into renamed_missing_field

serde_tests/Cargo.toml

@@ -14,14 +14,14 @@ build = "build.rs"
 nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"]
 
 [build-dependencies]
-syntex = { version = "^0.30.0" }
-syntex_syntax = { version = "^0.30.0" }
+syntex = { version = "^0.31.0" }
+syntex_syntax = { version = "^0.31.0" }
 serde_codegen = { version = "*", path = "../serde_codegen", features = ["with-syntex"] }
 
 [dev-dependencies]
 rustc-serialize = "^0.3.16"
 serde = { version = "*", path = "../serde" }
-syntex = "^0.30.0"
+syntex = "^0.31.0"
 
 [dependencies]
 clippy = { version = "^0.*", optional = true }

serde_tests/tests/test_macros.rs

@@ -6,6 +6,13 @@ trait Trait {
 }
 */
 
+// That tests that the derived Serialize implementation doesn't trigger
+// any warning about `serializer` not being used, in case of empty enums.
+#[derive(Serialize)]
+#[allow(dead_code)]
+#[deny(unused_variables)]
+enum Void {}
+
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 struct NamedUnit;