pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-04-23 00:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update ui tests to 2018 edition

Browse Source
This commit is contained in:
David Tolnay
2018-12-31 21:36:59 -05:00
parent ab3f4971f0
commit 05ab569a80
189 changed files with 401 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test_suite/tests/ui/with-variant/skip_de_newtype_field.rs
+1 -2
View File
@@ -1,5 +1,4 @@
#[macro_use]
extern crate serde_derive;
use serde_derive::Deserialize;
#[derive(Deserialize)]
enum Enum {
test_suite/tests/ui/with-variant/skip_de_newtype_field.stderr
+3 -3
View File
@@ -1,8 +1,8 @@
error: variant `Newtype` cannot have both #[serde(deserialize_with)] and a field #0 marked with #[serde(skip_deserializing)]
--> $DIR/skip_de_newtype_field.rs:6:5
--> $DIR/skip_de_newtype_field.rs:5:5
|
6 | / #[serde(deserialize_with = "deserialize_some_newtype_variant")]
7 | | Newtype(#[serde(skip_deserializing)] String),
5 | / #[serde(deserialize_with = "deserialize_some_newtype_variant")]
6 | | Newtype(#[serde(skip_deserializing)] String),
| |________________________________________________^
error: aborting due to previous error
test_suite/tests/ui/with-variant/skip_de_struct_field.rs
+1 -2
View File
@@ -1,5 +1,4 @@
#[macro_use]
extern crate serde_derive;
use serde_derive::Deserialize;
#[derive(Deserialize)]
enum Enum {
test_suite/tests/ui/with-variant/skip_de_struct_field.stderr
+7 -7
View File
@@ -1,12 +1,12 @@
error: variant `Struct` cannot have both #[serde(deserialize_with)] and a field `f1` marked with #[serde(skip_deserializing)]
--> $DIR/skip_de_struct_field.rs:6:5
--> $DIR/skip_de_struct_field.rs:5:5
|
6 | / #[serde(deserialize_with = "deserialize_some_other_variant")]
7 | | Struct {
8 | | #[serde(skip_deserializing)]
9 | | f1: String,
10 | | f2: u8,
11 | | },
5 | / #[serde(deserialize_with = "deserialize_some_other_variant")]
6 | | Struct {
7 | | #[serde(skip_deserializing)]
8 | | f1: String,
9 | | f2: u8,
10 | | },
| |_____^
error: aborting due to previous error
test_suite/tests/ui/with-variant/skip_de_tuple_field.rs
+1 -2
View File
@@ -1,5 +1,4 @@
#[macro_use]
extern crate serde_derive;
use serde_derive::Deserialize;
#[derive(Deserialize)]
enum Enum {
test_suite/tests/ui/with-variant/skip_de_tuple_field.stderr
+3 -3
View File
@@ -1,8 +1,8 @@
error: variant `Tuple` cannot have both #[serde(deserialize_with)] and a field #0 marked with #[serde(skip_deserializing)]
--> $DIR/skip_de_tuple_field.rs:6:5
--> $DIR/skip_de_tuple_field.rs:5:5
|
6 | / #[serde(deserialize_with = "deserialize_some_other_variant")]
7 | | Tuple(#[serde(skip_deserializing)] String, u8),
5 | / #[serde(deserialize_with = "deserialize_some_other_variant")]
6 | | Tuple(#[serde(skip_deserializing)] String, u8),
| |__________________________________________________^
error: aborting due to previous error
test_suite/tests/ui/with-variant/skip_de_whole_variant.rs
+1 -2
View File
@@ -1,5 +1,4 @@
#[macro_use]
extern crate serde_derive;
use serde_derive::Deserialize;
#[derive(Deserialize)]
enum Enum {
test_suite/tests/ui/with-variant/skip_de_whole_variant.stderr
+4 -4
View File
@@ -1,9 +1,9 @@
error: variant `Unit` cannot have both #[serde(deserialize_with)] and #[serde(skip_deserializing)]
--> $DIR/skip_de_whole_variant.rs:6:5
--> $DIR/skip_de_whole_variant.rs:5:5
|
6 | / #[serde(deserialize_with = "deserialize_some_unit_variant")]
7 | | #[serde(skip_deserializing)]
8 | | Unit,
5 | / #[serde(deserialize_with = "deserialize_some_unit_variant")]
6 | | #[serde(skip_deserializing)]
7 | | Unit,
| |________^
error: aborting due to previous error
test_suite/tests/ui/with-variant/skip_ser_newtype_field.rs
+1 -2
View File
@@ -1,5 +1,4 @@
#[macro_use]
extern crate serde_derive;
use serde_derive::Serialize;
#[derive(Serialize)]
enum Enum {
test_suite/tests/ui/with-variant/skip_ser_newtype_field.stderr
+3 -3
View File
@@ -1,8 +1,8 @@
error: variant `Newtype` cannot have both #[serde(serialize_with)] and a field #0 marked with #[serde(skip_serializing)]
--> $DIR/skip_ser_newtype_field.rs:6:5
--> $DIR/skip_ser_newtype_field.rs:5:5
|
6 | / #[serde(serialize_with = "serialize_some_newtype_variant")]
7 | | Newtype(#[serde(skip_serializing)] String),
5 | / #[serde(serialize_with = "serialize_some_newtype_variant")]
6 | | Newtype(#[serde(skip_serializing)] String),
| |______________________________________________^
error: aborting due to previous error
test_suite/tests/ui/with-variant/skip_ser_newtype_field_if.rs
+1 -2
View File
@@ -1,5 +1,4 @@
#[macro_use]
extern crate serde_derive;
use serde_derive::Serialize;
#[derive(Serialize)]
enum Enum {
test_suite/tests/ui/with-variant/skip_ser_newtype_field_if.stderr
+3 -3
View File
@@ -1,8 +1,8 @@
error: variant `Newtype` cannot have both #[serde(serialize_with)] and a field #0 marked with #[serde(skip_serializing_if)]
--> $DIR/skip_ser_newtype_field_if.rs:6:5
--> $DIR/skip_ser_newtype_field_if.rs:5:5
|
6 | / #[serde(serialize_with = "serialize_some_newtype_variant")]
7 | | Newtype(#[serde(skip_serializing_if = "always")] String),
5 | / #[serde(serialize_with = "serialize_some_newtype_variant")]
6 | | Newtype(#[serde(skip_serializing_if = "always")] String),
| |____________________________________________________________^
error: aborting due to previous error
test_suite/tests/ui/with-variant/skip_ser_struct_field.rs
+1 -2
View File
@@ -1,5 +1,4 @@
#[macro_use]
extern crate serde_derive;
use serde_derive::Serialize;
#[derive(Serialize)]
enum Enum {
test_suite/tests/ui/with-variant/skip_ser_struct_field.stderr
+7 -7
View File
@@ -1,12 +1,12 @@
error: variant `Struct` cannot have both #[serde(serialize_with)] and a field `f1` marked with #[serde(skip_serializing)]
--> $DIR/skip_ser_struct_field.rs:6:5
--> $DIR/skip_ser_struct_field.rs:5:5
|
6 | / #[serde(serialize_with = "serialize_some_other_variant")]
7 | | Struct {
8 | | #[serde(skip_serializing)]
9 | | f1: String,
10 | | f2: u8,
11 | | },
5 | / #[serde(serialize_with = "serialize_some_other_variant")]
6 | | Struct {
7 | | #[serde(skip_serializing)]
8 | | f1: String,
9 | | f2: u8,
10 | | },
| |_____^
error: aborting due to previous error
test_suite/tests/ui/with-variant/skip_ser_struct_field_if.rs
+1 -2
View File
@@ -1,5 +1,4 @@
#[macro_use]
extern crate serde_derive;
use serde_derive::Serialize;
#[derive(Serialize)]
enum Enum {
test_suite/tests/ui/with-variant/skip_ser_struct_field_if.stderr
+7 -7
View File
@@ -1,12 +1,12 @@
error: variant `Struct` cannot have both #[serde(serialize_with)] and a field `f1` marked with #[serde(skip_serializing_if)]
--> $DIR/skip_ser_struct_field_if.rs:6:5
--> $DIR/skip_ser_struct_field_if.rs:5:5
|
6 | / #[serde(serialize_with = "serialize_some_newtype_variant")]
7 | | Struct {
8 | | #[serde(skip_serializing_if = "always")]
9 | | f1: String,
10 | | f2: u8,
11 | | },
5 | / #[serde(serialize_with = "serialize_some_newtype_variant")]
6 | | Struct {
7 | | #[serde(skip_serializing_if = "always")]
8 | | f1: String,
9 | | f2: u8,
10 | | },
| |_____^
error: aborting due to previous error
test_suite/tests/ui/with-variant/skip_ser_tuple_field.rs
+1 -2
View File
@@ -1,5 +1,4 @@
#[macro_use]
extern crate serde_derive;
use serde_derive::Serialize;
#[derive(Serialize)]
enum Enum {
test_suite/tests/ui/with-variant/skip_ser_tuple_field.stderr
+3 -3
View File
@@ -1,8 +1,8 @@
error: variant `Tuple` cannot have both #[serde(serialize_with)] and a field #0 marked with #[serde(skip_serializing)]
--> $DIR/skip_ser_tuple_field.rs:6:5
--> $DIR/skip_ser_tuple_field.rs:5:5
|
6 | / #[serde(serialize_with = "serialize_some_other_variant")]
7 | | Tuple(#[serde(skip_serializing)] String, u8),
5 | / #[serde(serialize_with = "serialize_some_other_variant")]
6 | | Tuple(#[serde(skip_serializing)] String, u8),
| |________________________________________________^
error: aborting due to previous error
test_suite/tests/ui/with-variant/skip_ser_tuple_field_if.rs
+1 -2
View File
@@ -1,5 +1,4 @@
#[macro_use]
extern crate serde_derive;
use serde_derive::Serialize;
#[derive(Serialize)]
enum Enum {
test_suite/tests/ui/with-variant/skip_ser_tuple_field_if.stderr
+3 -3
View File
@@ -1,8 +1,8 @@
error: variant `Tuple` cannot have both #[serde(serialize_with)] and a field #0 marked with #[serde(skip_serializing_if)]
--> $DIR/skip_ser_tuple_field_if.rs:6:5
--> $DIR/skip_ser_tuple_field_if.rs:5:5
|
6 | / #[serde(serialize_with = "serialize_some_other_variant")]
7 | | Tuple(#[serde(skip_serializing_if = "always")] String, u8),
5 | / #[serde(serialize_with = "serialize_some_other_variant")]
6 | | Tuple(#[serde(skip_serializing_if = "always")] String, u8),
| |______________________________________________________________^
error: aborting due to previous error
test_suite/tests/ui/with-variant/skip_ser_whole_variant.rs
+1 -2
View File
@@ -1,5 +1,4 @@
#[macro_use]
extern crate serde_derive;
use serde_derive::Serialize;
#[derive(Serialize)]
enum Enum {
test_suite/tests/ui/with-variant/skip_ser_whole_variant.stderr
+4 -4
View File
@@ -1,9 +1,9 @@
error: variant `Unit` cannot have both #[serde(serialize_with)] and #[serde(skip_serializing)]
--> $DIR/skip_ser_whole_variant.rs:6:5
--> $DIR/skip_ser_whole_variant.rs:5:5
|
6 | / #[serde(serialize_with = "serialize_some_unit_variant")]
7 | | #[serde(skip_serializing)]
8 | | Unit,
5 | / #[serde(serialize_with = "serialize_some_unit_variant")]
6 | | #[serde(skip_serializing)]
7 | | Unit,
| |________^
error: aborting due to previous error