From b27039d34d79058d3bbd33b2a33ad5e67db81372 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Wed, 28 Sep 2016 12:46:54 -0700 Subject: [PATCH] Compiletest error messages --- .../tests/compile-fail/duplicate-attribute/rename-and-ser.rs | 2 +- .../tests/compile-fail/duplicate-attribute/rename-rename-de.rs | 2 +- .../compile-fail/duplicate-attribute/rename-ser-rename-ser.rs | 2 +- .../tests/compile-fail/duplicate-attribute/rename-ser-rename.rs | 2 +- .../tests/compile-fail/duplicate-attribute/rename-ser-ser.rs | 2 +- .../tests/compile-fail/duplicate-attribute/two-rename-ser.rs | 2 +- serde_derive/tests/compile-fail/str_ref_deser.rs | 2 +- serde_derive/tests/compile-fail/unknown-attribute/container.rs | 2 +- serde_derive/tests/compile-fail/unknown-attribute/field.rs | 2 +- serde_derive/tests/compile-fail/unknown-attribute/variant.rs | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/serde_derive/tests/compile-fail/duplicate-attribute/rename-and-ser.rs b/serde_derive/tests/compile-fail/duplicate-attribute/rename-and-ser.rs index 4a6590aa..312583af 100644 --- a/serde_derive/tests/compile-fail/duplicate-attribute/rename-and-ser.rs +++ b/serde_derive/tests/compile-fail/duplicate-attribute/rename-and-ser.rs @@ -5,7 +5,7 @@ extern crate serde_derive; #[derive(Serialize)] //~ ERROR: custom derive attribute panicked struct S { - #[serde(rename="x", serialize="y")] // ERROR: unknown serde field attribute `serialize` + #[serde(rename="x", serialize="y")] //~^^ HELP: unknown serde field attribute `serialize` x: (), } diff --git a/serde_derive/tests/compile-fail/duplicate-attribute/rename-rename-de.rs b/serde_derive/tests/compile-fail/duplicate-attribute/rename-rename-de.rs index 21a31b6c..e6d6876a 100644 --- a/serde_derive/tests/compile-fail/duplicate-attribute/rename-rename-de.rs +++ b/serde_derive/tests/compile-fail/duplicate-attribute/rename-rename-de.rs @@ -6,7 +6,7 @@ extern crate serde_derive; #[derive(Serialize)] //~ ERROR: custom derive attribute panicked struct S { #[serde(rename="x")] - #[serde(rename(deserialize="y"))] // ERROR: duplicate serde attribute `rename` + #[serde(rename(deserialize="y"))] //~^^^ HELP: duplicate serde attribute `rename` x: (), } diff --git a/serde_derive/tests/compile-fail/duplicate-attribute/rename-ser-rename-ser.rs b/serde_derive/tests/compile-fail/duplicate-attribute/rename-ser-rename-ser.rs index be64ec03..d6937559 100644 --- a/serde_derive/tests/compile-fail/duplicate-attribute/rename-ser-rename-ser.rs +++ b/serde_derive/tests/compile-fail/duplicate-attribute/rename-ser-rename-ser.rs @@ -5,7 +5,7 @@ extern crate serde_derive; #[derive(Serialize)] //~ ERROR: custom derive attribute panicked struct S { - #[serde(rename(serialize="x"), rename(serialize="y"))] // ERROR: duplicate serde attribute `rename` + #[serde(rename(serialize="x"), rename(serialize="y"))] //~^^ HELP: duplicate serde attribute `rename` x: (), } diff --git a/serde_derive/tests/compile-fail/duplicate-attribute/rename-ser-rename.rs b/serde_derive/tests/compile-fail/duplicate-attribute/rename-ser-rename.rs index 1dd2a982..dcb0f69e 100644 --- a/serde_derive/tests/compile-fail/duplicate-attribute/rename-ser-rename.rs +++ b/serde_derive/tests/compile-fail/duplicate-attribute/rename-ser-rename.rs @@ -6,7 +6,7 @@ extern crate serde_derive; #[derive(Serialize)] //~ ERROR: custom derive attribute panicked struct S { #[serde(rename(serialize="x"))] - #[serde(rename="y")] // ERROR: duplicate serde attribute `rename` + #[serde(rename="y")] //~^^^ HELP: duplicate serde attribute `rename` x: (), } diff --git a/serde_derive/tests/compile-fail/duplicate-attribute/rename-ser-ser.rs b/serde_derive/tests/compile-fail/duplicate-attribute/rename-ser-ser.rs index ef9a7c5c..af9116e5 100644 --- a/serde_derive/tests/compile-fail/duplicate-attribute/rename-ser-ser.rs +++ b/serde_derive/tests/compile-fail/duplicate-attribute/rename-ser-ser.rs @@ -5,7 +5,7 @@ extern crate serde_derive; #[derive(Serialize)] //~ ERROR: custom derive attribute panicked struct S { - #[serde(rename(serialize="x", serialize="y"))] // ERROR: duplicate serde attribute `rename` + #[serde(rename(serialize="x", serialize="y"))] //~^^ HELP: duplicate serde attribute `rename` x: (), } diff --git a/serde_derive/tests/compile-fail/duplicate-attribute/two-rename-ser.rs b/serde_derive/tests/compile-fail/duplicate-attribute/two-rename-ser.rs index 35e9a5a0..a518839d 100644 --- a/serde_derive/tests/compile-fail/duplicate-attribute/two-rename-ser.rs +++ b/serde_derive/tests/compile-fail/duplicate-attribute/two-rename-ser.rs @@ -6,7 +6,7 @@ extern crate serde_derive; #[derive(Serialize)] //~ ERROR: custom derive attribute panicked struct S { #[serde(rename(serialize="x"))] - #[serde(rename(serialize="y"))] // ERROR: duplicate serde attribute `rename` + #[serde(rename(serialize="y"))] //~^^^ HELP: duplicate serde attribute `rename` x: (), } diff --git a/serde_derive/tests/compile-fail/str_ref_deser.rs b/serde_derive/tests/compile-fail/str_ref_deser.rs index 98c21617..9a99e72b 100644 --- a/serde_derive/tests/compile-fail/str_ref_deser.rs +++ b/serde_derive/tests/compile-fail/str_ref_deser.rs @@ -5,7 +5,7 @@ extern crate serde_derive; #[derive(Serialize, Deserialize)] //~ ERROR: custom derive attribute panicked struct Test<'a> { - s: &'a str, // ERROR: Serde does not support deserializing fields of type &str + s: &'a str, //~^^ HELP: Serde does not support deserializing fields of type &str } fn main() {} diff --git a/serde_derive/tests/compile-fail/unknown-attribute/container.rs b/serde_derive/tests/compile-fail/unknown-attribute/container.rs index 1815a7ce..2b0e1cb2 100644 --- a/serde_derive/tests/compile-fail/unknown-attribute/container.rs +++ b/serde_derive/tests/compile-fail/unknown-attribute/container.rs @@ -4,7 +4,7 @@ extern crate serde_derive; #[derive(Serialize)] //~ ERROR: custom derive attribute panicked -#[serde(abc="xyz")] // ERROR: unknown serde container attribute `abc` +#[serde(abc="xyz")] //~^ HELP: unknown serde container attribute `abc` struct A { x: u32, } diff --git a/serde_derive/tests/compile-fail/unknown-attribute/field.rs b/serde_derive/tests/compile-fail/unknown-attribute/field.rs index 5cc6372c..1b2d8e6c 100644 --- a/serde_derive/tests/compile-fail/unknown-attribute/field.rs +++ b/serde_derive/tests/compile-fail/unknown-attribute/field.rs @@ -5,7 +5,7 @@ extern crate serde_derive; #[derive(Serialize)] //~ ERROR: custom derive attribute panicked struct C { - #[serde(abc="xyz")] // ERROR: unknown serde field attribute `abc` + #[serde(abc="xyz")] //~^^ HELP: unknown serde field attribute `abc` x: u32, } diff --git a/serde_derive/tests/compile-fail/unknown-attribute/variant.rs b/serde_derive/tests/compile-fail/unknown-attribute/variant.rs index 353ef91f..239fcc89 100644 --- a/serde_derive/tests/compile-fail/unknown-attribute/variant.rs +++ b/serde_derive/tests/compile-fail/unknown-attribute/variant.rs @@ -5,7 +5,7 @@ extern crate serde_derive; #[derive(Serialize)] //~ ERROR: custom derive attribute panicked enum E { - #[serde(abc="xyz")] // ERROR: unknown serde variant attribute `abc` + #[serde(abc="xyz")] //~^^ HELP: unknown serde variant attribute `abc` V, }