diff --git a/LICENSE-MIT b/LICENSE-MIT index 39d4bdb5..31aa7938 100644 --- a/LICENSE-MIT +++ b/LICENSE-MIT @@ -1,5 +1,3 @@ -Copyright (c) 2014 The Rust Project Developers - Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the diff --git a/serde/src/de/from_primitive.rs b/serde/src/de/from_primitive.rs index a8120fed..544f3f1b 100644 --- a/serde/src/de/from_primitive.rs +++ b/serde/src/de/from_primitive.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use lib::*; macro_rules! int_to_int { diff --git a/serde/src/de/ignored_any.rs b/serde/src/de/ignored_any.rs index 1e92146e..1c2064df 100644 --- a/serde/src/de/ignored_any.rs +++ b/serde/src/de/ignored_any.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use lib::*; use de::{Deserialize, Deserializer, Error, MapAccess, SeqAccess, Visitor}; diff --git a/serde/src/de/impls.rs b/serde/src/de/impls.rs index 17b1064f..95531661 100644 --- a/serde/src/de/impls.rs +++ b/serde/src/de/impls.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use lib::*; use de::{ diff --git a/serde/src/de/mod.rs b/serde/src/de/mod.rs index e2db0218..4ce53345 100644 --- a/serde/src/de/mod.rs +++ b/serde/src/de/mod.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Generic data structure deserialization framework. //! //! The two most important traits in this module are [`Deserialize`] and diff --git a/serde/src/de/utf8.rs b/serde/src/de/utf8.rs index 37221a1e..576fd03c 100644 --- a/serde/src/de/utf8.rs +++ b/serde/src/de/utf8.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use lib::*; const TAG_CONT: u8 = 0b1000_0000; diff --git a/serde/src/de/value.rs b/serde/src/de/value.rs index fe097042..4f8e2b6c 100644 --- a/serde/src/de/value.rs +++ b/serde/src/de/value.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Building blocks for deserializing basic values using the `IntoDeserializer` //! trait. //! diff --git a/serde/src/export.rs b/serde/src/export.rs index 0f7cd1a2..805f45ab 100644 --- a/serde/src/export.rs +++ b/serde/src/export.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use lib::clone::Clone; pub use lib::convert::{From, Into}; pub use lib::default::Default; diff --git a/serde/src/lib.rs b/serde/src/lib.rs index 99f585eb..287c4662 100644 --- a/serde/src/lib.rs +++ b/serde/src/lib.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! # Serde //! //! Serde is a framework for ***ser***ializing and ***de***serializing Rust data diff --git a/serde/src/macros.rs b/serde/src/macros.rs index 9d099670..a10280da 100644 --- a/serde/src/macros.rs +++ b/serde/src/macros.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Super explicit first paragraph because this shows up at the top level and // trips up people who are just looking for basic Serialize / Deserialize // documentation. diff --git a/serde/src/private/de.rs b/serde/src/private/de.rs index b32c3151..f7219b2c 100644 --- a/serde/src/private/de.rs +++ b/serde/src/private/de.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use lib::*; use de::{Deserialize, DeserializeSeed, Deserializer, Error, IntoDeserializer, Visitor}; diff --git a/serde/src/private/macros.rs b/serde/src/private/macros.rs index adbfd664..4f7054f5 100644 --- a/serde/src/private/macros.rs +++ b/serde/src/private/macros.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[doc(hidden)] #[macro_export] macro_rules! __private_serialize { diff --git a/serde/src/private/mod.rs b/serde/src/private/mod.rs index af88a51a..79e0a7d0 100644 --- a/serde/src/private/mod.rs +++ b/serde/src/private/mod.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod macros; pub mod de; diff --git a/serde/src/private/ser.rs b/serde/src/private/ser.rs index ac7d1dec..05f7e40a 100644 --- a/serde/src/private/ser.rs +++ b/serde/src/private/ser.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use lib::*; use ser::{self, Impossible, Serialize, SerializeMap, SerializeStruct, Serializer}; diff --git a/serde/src/ser/impls.rs b/serde/src/ser/impls.rs index cafd53cd..3fab473d 100644 --- a/serde/src/ser/impls.rs +++ b/serde/src/ser/impls.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use lib::*; use ser::{Error, Serialize, SerializeTuple, Serializer}; diff --git a/serde/src/ser/impossible.rs b/serde/src/ser/impossible.rs index 988ed0c1..674d7484 100644 --- a/serde/src/ser/impossible.rs +++ b/serde/src/ser/impossible.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module contains `Impossible` serializer and its implementations. use lib::*; diff --git a/serde/src/ser/mod.rs b/serde/src/ser/mod.rs index 76d54485..57732450 100644 --- a/serde/src/ser/mod.rs +++ b/serde/src/ser/mod.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Generic data structure serialization framework. //! //! The two most important traits in this module are [`Serialize`] and diff --git a/serde_derive/src/bound.rs b/serde_derive/src/bound.rs index 4f692c6e..7257862d 100644 --- a/serde_derive/src/bound.rs +++ b/serde_derive/src/bound.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::HashSet; use syn; diff --git a/serde_derive/src/de.rs b/serde_derive/src/de.rs index 713475ff..e6ff6c95 100644 --- a/serde_derive/src/de.rs +++ b/serde_derive/src/de.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use proc_macro2::{Literal, Span, TokenStream}; use quote::ToTokens; use syn::punctuated::Punctuated; diff --git a/serde_derive/src/fragment.rs b/serde_derive/src/fragment.rs index eb019453..85a57974 100644 --- a/serde_derive/src/fragment.rs +++ b/serde_derive/src/fragment.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use proc_macro2::TokenStream; use quote::ToTokens; use syn::token; diff --git a/serde_derive/src/internals/ast.rs b/serde_derive/src/internals/ast.rs index eaa314af..c965af67 100644 --- a/serde_derive/src/internals/ast.rs +++ b/serde_derive/src/internals/ast.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A Serde ast, parsed from the Syn ast and ready to generate Rust code. use internals::attr; diff --git a/serde_derive/src/internals/attr.rs b/serde_derive/src/internals/attr.rs index 0cfe0366..f87148b1 100644 --- a/serde_derive/src/internals/attr.rs +++ b/serde_derive/src/internals/attr.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use internals::Ctxt; use proc_macro2::{Group, Span, TokenStream, TokenTree}; use std::collections::BTreeSet; diff --git a/serde_derive/src/internals/case.rs b/serde_derive/src/internals/case.rs index 43f879fc..e21558a7 100644 --- a/serde_derive/src/internals/case.rs +++ b/serde_derive/src/internals/case.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Code to convert the Rust-styled field/variant (e.g. `my_field`, `MyType`) to the //! case of the source (e.g. `my-field`, `MY_FIELD`). diff --git a/serde_derive/src/internals/check.rs b/serde_derive/src/internals/check.rs index 01c4d103..a6c15b87 100644 --- a/serde_derive/src/internals/check.rs +++ b/serde_derive/src/internals/check.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use internals::ast::{Container, Data, Field, Style}; use internals::attr::{EnumTag, Identifier}; use internals::{Ctxt, Derive}; diff --git a/serde_derive/src/internals/ctxt.rs b/serde_derive/src/internals/ctxt.rs index 51c72f7c..79d7bbe9 100644 --- a/serde_derive/src/internals/ctxt.rs +++ b/serde_derive/src/internals/ctxt.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::RefCell; use std::fmt::Display; use std::thread; diff --git a/serde_derive/src/internals/mod.rs b/serde_derive/src/internals/mod.rs index 7a39688d..c31b3f9f 100644 --- a/serde_derive/src/internals/mod.rs +++ b/serde_derive/src/internals/mod.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod ast; pub mod attr; diff --git a/serde_derive/src/lib.rs b/serde_derive/src/lib.rs index 35ca6b77..40f99201 100644 --- a/serde_derive/src/lib.rs +++ b/serde_derive/src/lib.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This crate provides Serde's two derive macros. //! //! ```rust diff --git a/serde_derive/src/ser.rs b/serde_derive/src/ser.rs index 2d87cf4a..5afba924 100644 --- a/serde_derive/src/ser.rs +++ b/serde_derive/src/ser.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use proc_macro2::{Span, TokenStream}; use syn::spanned::Spanned; use syn::{self, Ident, Index, Member}; diff --git a/serde_derive_internals/lib.rs b/serde_derive_internals/lib.rs index bb10d138..dc303082 100644 --- a/serde_derive_internals/lib.rs +++ b/serde_derive_internals/lib.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![doc(html_root_url = "https://docs.rs/serde_derive_internals/0.24.1")] #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))] #![cfg_attr( diff --git a/serde_test/src/assert.rs b/serde_test/src/assert.rs index fec6c9dc..11130791 100644 --- a/serde_test/src/assert.rs +++ b/serde_test/src/assert.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use serde::{Deserialize, Serialize}; use de::Deserializer; diff --git a/serde_test/src/de.rs b/serde_test/src/de.rs index e317f654..60e08a31 100644 --- a/serde_test/src/de.rs +++ b/serde_test/src/de.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use serde::de::value::{MapAccessDeserializer, SeqAccessDeserializer}; use serde::de::{ self, Deserialize, DeserializeSeed, EnumAccess, IntoDeserializer, MapAccess, SeqAccess, diff --git a/serde_test/src/error.rs b/serde_test/src/error.rs index ea4d4fa7..54a71d2d 100644 --- a/serde_test/src/error.rs +++ b/serde_test/src/error.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::error; use std::fmt::{self, Display}; diff --git a/serde_test/src/lib.rs b/serde_test/src/lib.rs index 8986101a..a809daa6 100644 --- a/serde_test/src/lib.rs +++ b/serde_test/src/lib.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This crate provides a convenient concise way to write unit tests for //! implementations of [`Serialize`] and [`Deserialize`]. //! diff --git a/serde_test/src/ser.rs b/serde_test/src/ser.rs index a0159c2c..091ac434 100644 --- a/serde_test/src/ser.rs +++ b/serde_test/src/ser.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use serde::{ser, Serialize}; use error::Error; diff --git a/serde_test/src/token.rs b/serde_test/src/token.rs index 976bbe36..80d6978c 100644 --- a/serde_test/src/token.rs +++ b/serde_test/src/token.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::{self, Debug, Display}; #[derive(Copy, Clone, PartialEq, Debug)] diff --git a/test_suite/deps/src/lib.rs b/test_suite/deps/src/lib.rs index 78f6f4d1..e63ee9d4 100644 --- a/test_suite/deps/src/lib.rs +++ b/test_suite/deps/src/lib.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(/*=============================================] #![=== Serde test suite requires a nightly compiler. ===] #![====================================================*/)] diff --git a/test_suite/no_std/src/main.rs b/test_suite/no_std/src/main.rs index 80b8ca21..dd97d6d5 100644 --- a/test_suite/no_std/src/main.rs +++ b/test_suite/no_std/src/main.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(lang_items, start)] #![no_std] diff --git a/test_suite/tests/compiletest.rs b/test_suite/tests/compiletest.rs index e388c10c..c9d99601 100644 --- a/test_suite/tests/compiletest.rs +++ b/test_suite/tests/compiletest.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![cfg(feature = "unstable")] extern crate compiletest_rs as compiletest; diff --git a/test_suite/tests/macros/mod.rs b/test_suite/tests/macros/mod.rs index 9a917bcf..2c5a8fa2 100644 --- a/test_suite/tests/macros/mod.rs +++ b/test_suite/tests/macros/mod.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! btreeset { () => { BTreeSet::new() diff --git a/test_suite/tests/test_annotations.rs b/test_suite/tests/test_annotations.rs index b98b60d0..493746da 100644 --- a/test_suite/tests/test_annotations.rs +++ b/test_suite/tests/test_annotations.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))] #![cfg_attr(feature = "cargo-clippy", allow(cast_lossless))] diff --git a/test_suite/tests/test_borrow.rs b/test_suite/tests/test_borrow.rs index 1badfb8b..a540edef 100644 --- a/test_suite/tests/test_borrow.rs +++ b/test_suite/tests/test_borrow.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/test_de.rs b/test_suite/tests/test_de.rs index 858fb25d..eb995a12 100644 --- a/test_suite/tests/test_de.rs +++ b/test_suite/tests/test_de.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))] #![cfg_attr(feature = "cargo-clippy", allow(decimal_literal_representation))] #![cfg_attr(feature = "unstable", feature(never_type))] diff --git a/test_suite/tests/test_gen.rs b/test_suite/tests/test_gen.rs index f130a84c..667df039 100644 --- a/test_suite/tests/test_gen.rs +++ b/test_suite/tests/test_gen.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developer -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // These just test that serde_derive is able to produce code that compiles // successfully when there are a variety of generics and non-(de)serializable // types involved. diff --git a/test_suite/tests/test_identifier.rs b/test_suite/tests/test_identifier.rs index 65f10392..d81c5603 100644 --- a/test_suite/tests/test_identifier.rs +++ b/test_suite/tests/test_identifier.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/test_macros.rs b/test_suite/tests/test_macros.rs index 9d0e8d9d..4a5b79c9 100644 --- a/test_suite/tests/test_macros.rs +++ b/test_suite/tests/test_macros.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(trivial_numeric_casts)] #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))] #![cfg_attr(feature = "cargo-clippy", allow(redundant_field_names))] diff --git a/test_suite/tests/test_remote.rs b/test_suite/tests/test_remote.rs index 64d03ae3..db66c3c5 100644 --- a/test_suite/tests/test_remote.rs +++ b/test_suite/tests/test_remote.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))] #![cfg_attr(feature = "cargo-clippy", allow(redundant_field_names))] diff --git a/test_suite/tests/test_roundtrip.rs b/test_suite/tests/test_roundtrip.rs index 199dbb3b..77842df5 100644 --- a/test_suite/tests/test_roundtrip.rs +++ b/test_suite/tests/test_roundtrip.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate serde_test; use self::serde_test::{assert_tokens, Configure, Token}; diff --git a/test_suite/tests/test_ser.rs b/test_suite/tests/test_ser.rs index 81129540..790e929e 100644 --- a/test_suite/tests/test_ser.rs +++ b/test_suite/tests/test_ser.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![cfg_attr(feature = "unstable", feature(never_type))] #[macro_use] diff --git a/test_suite/tests/test_unstable.rs b/test_suite/tests/test_unstable.rs index 4cabd1c2..6339d32e 100644 --- a/test_suite/tests/test_unstable.rs +++ b/test_suite/tests/test_unstable.rs @@ -1,11 +1,3 @@ -// Copyright 2018 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(warnings)] #[cfg(feature = "unstable")] diff --git a/test_suite/tests/test_value.rs b/test_suite/tests/test_value.rs index 180e72f2..7f8fb0ac 100644 --- a/test_suite/tests/test_value.rs +++ b/test_suite/tests/test_value.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/borrow/bad_lifetimes.rs b/test_suite/tests/ui/borrow/bad_lifetimes.rs index 13242457..1bcc7b05 100644 --- a/test_suite/tests/ui/borrow/bad_lifetimes.rs +++ b/test_suite/tests/ui/borrow/bad_lifetimes.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/borrow/bad_lifetimes.stderr b/test_suite/tests/ui/borrow/bad_lifetimes.stderr index b8676ccc..2e51b446 100644 --- a/test_suite/tests/ui/borrow/bad_lifetimes.stderr +++ b/test_suite/tests/ui/borrow/bad_lifetimes.stderr @@ -1,8 +1,8 @@ error: failed to parse borrowed lifetimes: "zzz" - --> $DIR/bad_lifetimes.rs:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/bad_lifetimes.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/borrow/duplicate_lifetime.rs b/test_suite/tests/ui/borrow/duplicate_lifetime.rs index 5d190b96..447aa48a 100644 --- a/test_suite/tests/ui/borrow/duplicate_lifetime.rs +++ b/test_suite/tests/ui/borrow/duplicate_lifetime.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/borrow/duplicate_lifetime.stderr b/test_suite/tests/ui/borrow/duplicate_lifetime.stderr index ce756d3f..d6170da2 100644 --- a/test_suite/tests/ui/borrow/duplicate_lifetime.stderr +++ b/test_suite/tests/ui/borrow/duplicate_lifetime.stderr @@ -1,8 +1,8 @@ error: duplicate borrowed lifetime `'a` - --> $DIR/duplicate_lifetime.rs:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/duplicate_lifetime.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/borrow/duplicate_variant.rs b/test_suite/tests/ui/borrow/duplicate_variant.rs index c970262a..349037ba 100644 --- a/test_suite/tests/ui/borrow/duplicate_variant.rs +++ b/test_suite/tests/ui/borrow/duplicate_variant.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/borrow/duplicate_variant.stderr b/test_suite/tests/ui/borrow/duplicate_variant.stderr index 05835166..8b4c86fc 100644 --- a/test_suite/tests/ui/borrow/duplicate_variant.stderr +++ b/test_suite/tests/ui/borrow/duplicate_variant.stderr @@ -1,8 +1,8 @@ error: duplicate serde attribute `borrow` - --> $DIR/duplicate_variant.rs:15:10 - | -15 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/duplicate_variant.rs:7:10 + | +7 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/borrow/empty_lifetimes.rs b/test_suite/tests/ui/borrow/empty_lifetimes.rs index f10a73f3..0c2c6ba9 100644 --- a/test_suite/tests/ui/borrow/empty_lifetimes.rs +++ b/test_suite/tests/ui/borrow/empty_lifetimes.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/borrow/empty_lifetimes.stderr b/test_suite/tests/ui/borrow/empty_lifetimes.stderr index 2c6c9c0b..69b7b039 100644 --- a/test_suite/tests/ui/borrow/empty_lifetimes.stderr +++ b/test_suite/tests/ui/borrow/empty_lifetimes.stderr @@ -1,8 +1,8 @@ error: at least one lifetime must be borrowed - --> $DIR/empty_lifetimes.rs:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/empty_lifetimes.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/borrow/no_lifetimes.rs b/test_suite/tests/ui/borrow/no_lifetimes.rs index c5796069..e78729f3 100644 --- a/test_suite/tests/ui/borrow/no_lifetimes.rs +++ b/test_suite/tests/ui/borrow/no_lifetimes.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/borrow/no_lifetimes.stderr b/test_suite/tests/ui/borrow/no_lifetimes.stderr index e2ced937..84ea8f30 100644 --- a/test_suite/tests/ui/borrow/no_lifetimes.stderr +++ b/test_suite/tests/ui/borrow/no_lifetimes.stderr @@ -1,8 +1,8 @@ error: field `s` has no lifetimes to borrow - --> $DIR/no_lifetimes.rs:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/no_lifetimes.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/borrow/struct_variant.rs b/test_suite/tests/ui/borrow/struct_variant.rs index 9b16ef61..68e10582 100644 --- a/test_suite/tests/ui/borrow/struct_variant.rs +++ b/test_suite/tests/ui/borrow/struct_variant.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/borrow/struct_variant.stderr b/test_suite/tests/ui/borrow/struct_variant.stderr index baa692be..a2c51dc3 100644 --- a/test_suite/tests/ui/borrow/struct_variant.stderr +++ b/test_suite/tests/ui/borrow/struct_variant.stderr @@ -1,8 +1,8 @@ error: #[serde(borrow)] may only be used on newtype variants - --> $DIR/struct_variant.rs:15:10 - | -15 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/struct_variant.rs:7:10 + | +7 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/borrow/wrong_lifetime.rs b/test_suite/tests/ui/borrow/wrong_lifetime.rs index 4b3396f7..8413c06d 100644 --- a/test_suite/tests/ui/borrow/wrong_lifetime.rs +++ b/test_suite/tests/ui/borrow/wrong_lifetime.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/borrow/wrong_lifetime.stderr b/test_suite/tests/ui/borrow/wrong_lifetime.stderr index 7d20f67d..3359b180 100644 --- a/test_suite/tests/ui/borrow/wrong_lifetime.stderr +++ b/test_suite/tests/ui/borrow/wrong_lifetime.stderr @@ -1,8 +1,8 @@ error: field `s` does not have lifetime 'b - --> $DIR/wrong_lifetime.rs:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/wrong_lifetime.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/conflict/adjacent-tag.rs b/test_suite/tests/ui/conflict/adjacent-tag.rs index 74091f64..72e0886f 100644 --- a/test_suite/tests/ui/conflict/adjacent-tag.rs +++ b/test_suite/tests/ui/conflict/adjacent-tag.rs @@ -1,11 +1,3 @@ -// Copyright 2018 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/conflict/adjacent-tag.stderr b/test_suite/tests/ui/conflict/adjacent-tag.stderr index 713ec75e..89481d88 100644 --- a/test_suite/tests/ui/conflict/adjacent-tag.stderr +++ b/test_suite/tests/ui/conflict/adjacent-tag.stderr @@ -1,8 +1,8 @@ error: enum tags `conflict` for type and content conflict with each other - --> $DIR/adjacent-tag.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/adjacent-tag.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/conflict/flatten-newtype-struct.rs b/test_suite/tests/ui/conflict/flatten-newtype-struct.rs index cf6307dd..41b35a8d 100644 --- a/test_suite/tests/ui/conflict/flatten-newtype-struct.rs +++ b/test_suite/tests/ui/conflict/flatten-newtype-struct.rs @@ -1,11 +1,3 @@ -// Copyright 2018 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/conflict/flatten-newtype-struct.stderr b/test_suite/tests/ui/conflict/flatten-newtype-struct.stderr index 45f15ea2..50e93191 100644 --- a/test_suite/tests/ui/conflict/flatten-newtype-struct.stderr +++ b/test_suite/tests/ui/conflict/flatten-newtype-struct.stderr @@ -1,8 +1,8 @@ error: #[serde(flatten)] cannot be used on newtype structs - --> $DIR/flatten-newtype-struct.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/flatten-newtype-struct.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/conflict/flatten-skip-deserializing.rs b/test_suite/tests/ui/conflict/flatten-skip-deserializing.rs index fe7a30ad..82999094 100644 --- a/test_suite/tests/ui/conflict/flatten-skip-deserializing.rs +++ b/test_suite/tests/ui/conflict/flatten-skip-deserializing.rs @@ -1,11 +1,3 @@ -// Copyright 2018 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/conflict/flatten-skip-deserializing.stderr b/test_suite/tests/ui/conflict/flatten-skip-deserializing.stderr index 771011b2..1c53049c 100644 --- a/test_suite/tests/ui/conflict/flatten-skip-deserializing.stderr +++ b/test_suite/tests/ui/conflict/flatten-skip-deserializing.stderr @@ -1,8 +1,8 @@ error: #[serde(flatten] can not be combined with #[serde(skip_deserializing)] - --> $DIR/flatten-skip-deserializing.rs:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/flatten-skip-deserializing.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/conflict/flatten-skip-serializing-if.rs b/test_suite/tests/ui/conflict/flatten-skip-serializing-if.rs index 22cd9a26..e87b233d 100644 --- a/test_suite/tests/ui/conflict/flatten-skip-serializing-if.rs +++ b/test_suite/tests/ui/conflict/flatten-skip-serializing-if.rs @@ -1,11 +1,3 @@ -// Copyright 2018 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/conflict/flatten-skip-serializing-if.stderr b/test_suite/tests/ui/conflict/flatten-skip-serializing-if.stderr index e450d594..9f2fecc2 100644 --- a/test_suite/tests/ui/conflict/flatten-skip-serializing-if.stderr +++ b/test_suite/tests/ui/conflict/flatten-skip-serializing-if.stderr @@ -1,8 +1,8 @@ error: #[serde(flatten] can not be combined with #[serde(skip_serializing_if = "...")] - --> $DIR/flatten-skip-serializing-if.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/flatten-skip-serializing-if.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/conflict/flatten-skip-serializing.rs b/test_suite/tests/ui/conflict/flatten-skip-serializing.rs index b378986d..997049c8 100644 --- a/test_suite/tests/ui/conflict/flatten-skip-serializing.rs +++ b/test_suite/tests/ui/conflict/flatten-skip-serializing.rs @@ -1,11 +1,3 @@ -// Copyright 2018 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/conflict/flatten-skip-serializing.stderr b/test_suite/tests/ui/conflict/flatten-skip-serializing.stderr index f9d133b0..32a34c6f 100644 --- a/test_suite/tests/ui/conflict/flatten-skip-serializing.stderr +++ b/test_suite/tests/ui/conflict/flatten-skip-serializing.stderr @@ -1,8 +1,8 @@ error: #[serde(flatten] can not be combined with #[serde(skip_serializing)] - --> $DIR/flatten-skip-serializing.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/flatten-skip-serializing.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/conflict/flatten-tuple-struct.rs b/test_suite/tests/ui/conflict/flatten-tuple-struct.rs index 2e8d3e6c..ded52c79 100644 --- a/test_suite/tests/ui/conflict/flatten-tuple-struct.rs +++ b/test_suite/tests/ui/conflict/flatten-tuple-struct.rs @@ -1,11 +1,3 @@ -// Copyright 2018 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/conflict/flatten-tuple-struct.stderr b/test_suite/tests/ui/conflict/flatten-tuple-struct.stderr index a47287ff..ce9f3590 100644 --- a/test_suite/tests/ui/conflict/flatten-tuple-struct.stderr +++ b/test_suite/tests/ui/conflict/flatten-tuple-struct.stderr @@ -1,8 +1,8 @@ error: #[serde(flatten)] cannot be used on tuple structs - --> $DIR/flatten-tuple-struct.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/flatten-tuple-struct.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/conflict/internal-tag.rs b/test_suite/tests/ui/conflict/internal-tag.rs index 9d48979b..9beda346 100644 --- a/test_suite/tests/ui/conflict/internal-tag.rs +++ b/test_suite/tests/ui/conflict/internal-tag.rs @@ -1,11 +1,3 @@ -// Copyright 2018 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/conflict/internal-tag.stderr b/test_suite/tests/ui/conflict/internal-tag.stderr index 1bbc68e1..c4b3bb43 100644 --- a/test_suite/tests/ui/conflict/internal-tag.stderr +++ b/test_suite/tests/ui/conflict/internal-tag.stderr @@ -1,8 +1,8 @@ error: variant field name `conflict` conflicts with internal tag - --> $DIR/internal-tag.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/internal-tag.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/default-attribute/enum.rs b/test_suite/tests/ui/default-attribute/enum.rs index fecc4b76..e0ecc9f0 100644 --- a/test_suite/tests/ui/default-attribute/enum.rs +++ b/test_suite/tests/ui/default-attribute/enum.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/default-attribute/enum.stderr b/test_suite/tests/ui/default-attribute/enum.stderr index 1e7b0ee6..63bdd412 100644 --- a/test_suite/tests/ui/default-attribute/enum.stderr +++ b/test_suite/tests/ui/default-attribute/enum.stderr @@ -1,8 +1,8 @@ error: #[serde(default)] can only be used on structs with named fields - --> $DIR/enum.rs:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/enum.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/default-attribute/nameless_struct_fields.rs b/test_suite/tests/ui/default-attribute/nameless_struct_fields.rs index 20f3474d..8e33c919 100644 --- a/test_suite/tests/ui/default-attribute/nameless_struct_fields.rs +++ b/test_suite/tests/ui/default-attribute/nameless_struct_fields.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/default-attribute/nameless_struct_fields.stderr b/test_suite/tests/ui/default-attribute/nameless_struct_fields.stderr index e270b678..e8947395 100644 --- a/test_suite/tests/ui/default-attribute/nameless_struct_fields.stderr +++ b/test_suite/tests/ui/default-attribute/nameless_struct_fields.stderr @@ -1,8 +1,8 @@ error: #[serde(default)] can only be used on structs with named fields - --> $DIR/nameless_struct_fields.rs:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/nameless_struct_fields.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/duplicate-attribute/rename-and-ser.rs b/test_suite/tests/ui/duplicate-attribute/rename-and-ser.rs index 801699c7..a6fb30af 100644 --- a/test_suite/tests/ui/duplicate-attribute/rename-and-ser.rs +++ b/test_suite/tests/ui/duplicate-attribute/rename-and-ser.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/duplicate-attribute/rename-and-ser.stderr b/test_suite/tests/ui/duplicate-attribute/rename-and-ser.stderr index f96a8f26..6da3593c 100644 --- a/test_suite/tests/ui/duplicate-attribute/rename-and-ser.stderr +++ b/test_suite/tests/ui/duplicate-attribute/rename-and-ser.stderr @@ -1,8 +1,8 @@ error: unknown serde field attribute `serialize` - --> $DIR/rename-and-ser.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/rename-and-ser.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/duplicate-attribute/rename-rename-de.rs b/test_suite/tests/ui/duplicate-attribute/rename-rename-de.rs index ac7b3ec5..9c8d5dd7 100644 --- a/test_suite/tests/ui/duplicate-attribute/rename-rename-de.rs +++ b/test_suite/tests/ui/duplicate-attribute/rename-rename-de.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/duplicate-attribute/rename-rename-de.stderr b/test_suite/tests/ui/duplicate-attribute/rename-rename-de.stderr index 320952a2..8ad872da 100644 --- a/test_suite/tests/ui/duplicate-attribute/rename-rename-de.stderr +++ b/test_suite/tests/ui/duplicate-attribute/rename-rename-de.stderr @@ -1,8 +1,8 @@ error: duplicate serde attribute `rename` - --> $DIR/rename-rename-de.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/rename-rename-de.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/duplicate-attribute/rename-ser-rename-ser.rs b/test_suite/tests/ui/duplicate-attribute/rename-ser-rename-ser.rs index c99e5166..1512db51 100644 --- a/test_suite/tests/ui/duplicate-attribute/rename-ser-rename-ser.rs +++ b/test_suite/tests/ui/duplicate-attribute/rename-ser-rename-ser.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/duplicate-attribute/rename-ser-rename-ser.stderr b/test_suite/tests/ui/duplicate-attribute/rename-ser-rename-ser.stderr index cf7dd996..2fd3b014 100644 --- a/test_suite/tests/ui/duplicate-attribute/rename-ser-rename-ser.stderr +++ b/test_suite/tests/ui/duplicate-attribute/rename-ser-rename-ser.stderr @@ -1,8 +1,8 @@ error: duplicate serde attribute `rename` - --> $DIR/rename-ser-rename-ser.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/rename-ser-rename-ser.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/duplicate-attribute/rename-ser-rename.rs b/test_suite/tests/ui/duplicate-attribute/rename-ser-rename.rs index 35e0924c..8e6c0255 100644 --- a/test_suite/tests/ui/duplicate-attribute/rename-ser-rename.rs +++ b/test_suite/tests/ui/duplicate-attribute/rename-ser-rename.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/duplicate-attribute/rename-ser-rename.stderr b/test_suite/tests/ui/duplicate-attribute/rename-ser-rename.stderr index 8a9ea18b..82f5e76b 100644 --- a/test_suite/tests/ui/duplicate-attribute/rename-ser-rename.stderr +++ b/test_suite/tests/ui/duplicate-attribute/rename-ser-rename.stderr @@ -1,8 +1,8 @@ error: duplicate serde attribute `rename` - --> $DIR/rename-ser-rename.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/rename-ser-rename.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/duplicate-attribute/rename-ser-ser.rs b/test_suite/tests/ui/duplicate-attribute/rename-ser-ser.rs index 32040abb..0bc2a956 100644 --- a/test_suite/tests/ui/duplicate-attribute/rename-ser-ser.rs +++ b/test_suite/tests/ui/duplicate-attribute/rename-ser-ser.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/duplicate-attribute/rename-ser-ser.stderr b/test_suite/tests/ui/duplicate-attribute/rename-ser-ser.stderr index f175985e..3276c3dd 100644 --- a/test_suite/tests/ui/duplicate-attribute/rename-ser-ser.stderr +++ b/test_suite/tests/ui/duplicate-attribute/rename-ser-ser.stderr @@ -1,8 +1,8 @@ error: duplicate serde attribute `rename` - --> $DIR/rename-ser-ser.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/rename-ser-ser.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/duplicate-attribute/two-rename-ser.rs b/test_suite/tests/ui/duplicate-attribute/two-rename-ser.rs index 553e58d9..f03b393b 100644 --- a/test_suite/tests/ui/duplicate-attribute/two-rename-ser.rs +++ b/test_suite/tests/ui/duplicate-attribute/two-rename-ser.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/duplicate-attribute/two-rename-ser.stderr b/test_suite/tests/ui/duplicate-attribute/two-rename-ser.stderr index a3682108..7efb8f0b 100644 --- a/test_suite/tests/ui/duplicate-attribute/two-rename-ser.stderr +++ b/test_suite/tests/ui/duplicate-attribute/two-rename-ser.stderr @@ -1,8 +1,8 @@ error: duplicate serde attribute `rename` - --> $DIR/two-rename-ser.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/two-rename-ser.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/duplicate-attribute/with-and-serialize-with.rs b/test_suite/tests/ui/duplicate-attribute/with-and-serialize-with.rs index 603e37e7..0879e403 100644 --- a/test_suite/tests/ui/duplicate-attribute/with-and-serialize-with.rs +++ b/test_suite/tests/ui/duplicate-attribute/with-and-serialize-with.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/duplicate-attribute/with-and-serialize-with.stderr b/test_suite/tests/ui/duplicate-attribute/with-and-serialize-with.stderr index 934bc652..fd6dab3e 100644 --- a/test_suite/tests/ui/duplicate-attribute/with-and-serialize-with.stderr +++ b/test_suite/tests/ui/duplicate-attribute/with-and-serialize-with.stderr @@ -1,8 +1,8 @@ error: duplicate serde attribute `serialize_with` - --> $DIR/with-and-serialize-with.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/with-and-serialize-with.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/enum-representation/internal-tuple-variant.rs b/test_suite/tests/ui/enum-representation/internal-tuple-variant.rs index 86793f2f..3cfe715b 100644 --- a/test_suite/tests/ui/enum-representation/internal-tuple-variant.rs +++ b/test_suite/tests/ui/enum-representation/internal-tuple-variant.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/enum-representation/internal-tuple-variant.stderr b/test_suite/tests/ui/enum-representation/internal-tuple-variant.stderr index c5ced95b..ec37e181 100644 --- a/test_suite/tests/ui/enum-representation/internal-tuple-variant.stderr +++ b/test_suite/tests/ui/enum-representation/internal-tuple-variant.stderr @@ -1,8 +1,8 @@ error: #[serde(tag = "...")] cannot be used with tuple variants - --> $DIR/internal-tuple-variant.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/internal-tuple-variant.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/enum-representation/internally-tagged-struct.rs b/test_suite/tests/ui/enum-representation/internally-tagged-struct.rs index d119570d..54f895fd 100644 --- a/test_suite/tests/ui/enum-representation/internally-tagged-struct.rs +++ b/test_suite/tests/ui/enum-representation/internally-tagged-struct.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/enum-representation/internally-tagged-struct.stderr b/test_suite/tests/ui/enum-representation/internally-tagged-struct.stderr index 96eb3e1d..a0b6e4e8 100644 --- a/test_suite/tests/ui/enum-representation/internally-tagged-struct.stderr +++ b/test_suite/tests/ui/enum-representation/internally-tagged-struct.stderr @@ -1,8 +1,8 @@ error: #[serde(tag = "...")] can only be used on enums - --> $DIR/internally-tagged-struct.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/internally-tagged-struct.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/enum-representation/untagged-and-internal.rs b/test_suite/tests/ui/enum-representation/untagged-and-internal.rs index 32b125a6..e3c6ec2a 100644 --- a/test_suite/tests/ui/enum-representation/untagged-and-internal.rs +++ b/test_suite/tests/ui/enum-representation/untagged-and-internal.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/enum-representation/untagged-and-internal.stderr b/test_suite/tests/ui/enum-representation/untagged-and-internal.stderr index 1782b95d..196b1d01 100644 --- a/test_suite/tests/ui/enum-representation/untagged-and-internal.stderr +++ b/test_suite/tests/ui/enum-representation/untagged-and-internal.stderr @@ -1,8 +1,8 @@ error: enum cannot be both untagged and internally tagged - --> $DIR/untagged-and-internal.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/untagged-and-internal.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/enum-representation/untagged-struct.rs b/test_suite/tests/ui/enum-representation/untagged-struct.rs index 20321ebd..54be0ecc 100644 --- a/test_suite/tests/ui/enum-representation/untagged-struct.rs +++ b/test_suite/tests/ui/enum-representation/untagged-struct.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/enum-representation/untagged-struct.stderr b/test_suite/tests/ui/enum-representation/untagged-struct.stderr index a4615e83..70ad1807 100644 --- a/test_suite/tests/ui/enum-representation/untagged-struct.stderr +++ b/test_suite/tests/ui/enum-representation/untagged-struct.stderr @@ -1,8 +1,8 @@ error: #[serde(untagged)] can only be used on enums - --> $DIR/untagged-struct.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/untagged-struct.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/identifier/both.rs b/test_suite/tests/ui/identifier/both.rs index 1ab35b23..2b91c64a 100644 --- a/test_suite/tests/ui/identifier/both.rs +++ b/test_suite/tests/ui/identifier/both.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/identifier/both.stderr b/test_suite/tests/ui/identifier/both.stderr index 51951baa..4d21a047 100644 --- a/test_suite/tests/ui/identifier/both.stderr +++ b/test_suite/tests/ui/identifier/both.stderr @@ -1,8 +1,8 @@ error: `field_identifier` and `variant_identifier` cannot both be set - --> $DIR/both.rs:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/both.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/identifier/field_struct.rs b/test_suite/tests/ui/identifier/field_struct.rs index 682c9db6..5526d6b0 100644 --- a/test_suite/tests/ui/identifier/field_struct.rs +++ b/test_suite/tests/ui/identifier/field_struct.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/identifier/field_struct.stderr b/test_suite/tests/ui/identifier/field_struct.stderr index c32659e7..5463c018 100644 --- a/test_suite/tests/ui/identifier/field_struct.stderr +++ b/test_suite/tests/ui/identifier/field_struct.stderr @@ -1,8 +1,8 @@ error: `field_identifier` can only be used on an enum - --> $DIR/field_struct.rs:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/field_struct.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/identifier/field_tuple.rs b/test_suite/tests/ui/identifier/field_tuple.rs index 08a31785..beb5199e 100644 --- a/test_suite/tests/ui/identifier/field_tuple.rs +++ b/test_suite/tests/ui/identifier/field_tuple.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/identifier/field_tuple.stderr b/test_suite/tests/ui/identifier/field_tuple.stderr index 9899461c..d5893a9d 100644 --- a/test_suite/tests/ui/identifier/field_tuple.stderr +++ b/test_suite/tests/ui/identifier/field_tuple.stderr @@ -1,8 +1,8 @@ error: field_identifier may only contain unit variants - --> $DIR/field_tuple.rs:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/field_tuple.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/identifier/newtype_not_last.rs b/test_suite/tests/ui/identifier/newtype_not_last.rs index 6a94081a..307e181c 100644 --- a/test_suite/tests/ui/identifier/newtype_not_last.rs +++ b/test_suite/tests/ui/identifier/newtype_not_last.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/identifier/newtype_not_last.stderr b/test_suite/tests/ui/identifier/newtype_not_last.stderr index a873dad4..539639b5 100644 --- a/test_suite/tests/ui/identifier/newtype_not_last.stderr +++ b/test_suite/tests/ui/identifier/newtype_not_last.stderr @@ -1,8 +1,8 @@ error: `Other` must be the last variant - --> $DIR/newtype_not_last.rs:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/newtype_not_last.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/identifier/not_unit.rs b/test_suite/tests/ui/identifier/not_unit.rs index 31c8c3a1..2b831dec 100644 --- a/test_suite/tests/ui/identifier/not_unit.rs +++ b/test_suite/tests/ui/identifier/not_unit.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/identifier/not_unit.stderr b/test_suite/tests/ui/identifier/not_unit.stderr index 6cdddc8d..82b7afbc 100644 --- a/test_suite/tests/ui/identifier/not_unit.stderr +++ b/test_suite/tests/ui/identifier/not_unit.stderr @@ -1,8 +1,8 @@ error: #[serde(other)] must be on a unit variant - --> $DIR/not_unit.rs:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/not_unit.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/identifier/other_not_last.rs b/test_suite/tests/ui/identifier/other_not_last.rs index d18defb6..d264a1df 100644 --- a/test_suite/tests/ui/identifier/other_not_last.rs +++ b/test_suite/tests/ui/identifier/other_not_last.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/identifier/other_not_last.stderr b/test_suite/tests/ui/identifier/other_not_last.stderr index 3768f666..c1eb6c2f 100644 --- a/test_suite/tests/ui/identifier/other_not_last.stderr +++ b/test_suite/tests/ui/identifier/other_not_last.stderr @@ -1,8 +1,8 @@ error: #[serde(other)] must be the last variant - --> $DIR/other_not_last.rs:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/other_not_last.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/identifier/serialize.rs b/test_suite/tests/ui/identifier/serialize.rs index cb27efbb..dc6f761e 100644 --- a/test_suite/tests/ui/identifier/serialize.rs +++ b/test_suite/tests/ui/identifier/serialize.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/identifier/serialize.stderr b/test_suite/tests/ui/identifier/serialize.stderr index 9bdf463d..2327bb51 100644 --- a/test_suite/tests/ui/identifier/serialize.stderr +++ b/test_suite/tests/ui/identifier/serialize.stderr @@ -1,8 +1,8 @@ error: field identifiers cannot be serialized - --> $DIR/serialize.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/serialize.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/identifier/variant_struct.rs b/test_suite/tests/ui/identifier/variant_struct.rs index 6a8b4a01..4becbc42 100644 --- a/test_suite/tests/ui/identifier/variant_struct.rs +++ b/test_suite/tests/ui/identifier/variant_struct.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/identifier/variant_struct.stderr b/test_suite/tests/ui/identifier/variant_struct.stderr index 60d5cad1..9d5d3c1d 100644 --- a/test_suite/tests/ui/identifier/variant_struct.stderr +++ b/test_suite/tests/ui/identifier/variant_struct.stderr @@ -1,8 +1,8 @@ error: `variant_identifier` can only be used on an enum - --> $DIR/variant_struct.rs:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/variant_struct.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/identifier/variant_tuple.rs b/test_suite/tests/ui/identifier/variant_tuple.rs index 513924f0..6567296b 100644 --- a/test_suite/tests/ui/identifier/variant_tuple.rs +++ b/test_suite/tests/ui/identifier/variant_tuple.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/identifier/variant_tuple.stderr b/test_suite/tests/ui/identifier/variant_tuple.stderr index 3dd44504..8a9ff362 100644 --- a/test_suite/tests/ui/identifier/variant_tuple.stderr +++ b/test_suite/tests/ui/identifier/variant_tuple.stderr @@ -1,8 +1,8 @@ error: variant_identifier may only contain unit variants - --> $DIR/variant_tuple.rs:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/variant_tuple.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/precondition/deserialize_de_lifetime.rs b/test_suite/tests/ui/precondition/deserialize_de_lifetime.rs index f14b1f77..7ce4b6d8 100644 --- a/test_suite/tests/ui/precondition/deserialize_de_lifetime.rs +++ b/test_suite/tests/ui/precondition/deserialize_de_lifetime.rs @@ -1,11 +1,3 @@ -// Copyright 2018 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/precondition/deserialize_de_lifetime.stderr b/test_suite/tests/ui/precondition/deserialize_de_lifetime.stderr index 27efc697..94e2df57 100644 --- a/test_suite/tests/ui/precondition/deserialize_de_lifetime.stderr +++ b/test_suite/tests/ui/precondition/deserialize_de_lifetime.stderr @@ -1,8 +1,8 @@ error: cannot deserialize when there is a lifetime parameter called 'de - --> $DIR/deserialize_de_lifetime.rs:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/deserialize_de_lifetime.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/precondition/deserialize_dst.rs b/test_suite/tests/ui/precondition/deserialize_dst.rs index aaf8948e..a0aceaa3 100644 --- a/test_suite/tests/ui/precondition/deserialize_dst.rs +++ b/test_suite/tests/ui/precondition/deserialize_dst.rs @@ -1,11 +1,3 @@ -// Copyright 2018 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/precondition/deserialize_dst.stderr b/test_suite/tests/ui/precondition/deserialize_dst.stderr index 136fde1a..9447df5c 100644 --- a/test_suite/tests/ui/precondition/deserialize_dst.stderr +++ b/test_suite/tests/ui/precondition/deserialize_dst.stderr @@ -1,8 +1,8 @@ error: cannot deserialize a dynamically sized struct - --> $DIR/deserialize_dst.rs:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/deserialize_dst.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/remote/bad_getter.rs b/test_suite/tests/ui/remote/bad_getter.rs index 136cccef..9549394c 100644 --- a/test_suite/tests/ui/remote/bad_getter.rs +++ b/test_suite/tests/ui/remote/bad_getter.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/remote/bad_getter.stderr b/test_suite/tests/ui/remote/bad_getter.stderr index 960310ad..89a73c76 100644 --- a/test_suite/tests/ui/remote/bad_getter.stderr +++ b/test_suite/tests/ui/remote/bad_getter.stderr @@ -1,7 +1,7 @@ error: failed to parse path: "~~~" - --> $DIR/bad_getter.rs:18:10 + --> $DIR/bad_getter.rs:10:10 | -18 | #[derive(Serialize)] +10 | #[derive(Serialize)] | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/remote/bad_remote.rs b/test_suite/tests/ui/remote/bad_remote.rs index f553d63c..b186cc64 100644 --- a/test_suite/tests/ui/remote/bad_remote.rs +++ b/test_suite/tests/ui/remote/bad_remote.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/remote/bad_remote.stderr b/test_suite/tests/ui/remote/bad_remote.stderr index e8d4f381..a88cfefa 100644 --- a/test_suite/tests/ui/remote/bad_remote.stderr +++ b/test_suite/tests/ui/remote/bad_remote.stderr @@ -1,7 +1,7 @@ error: failed to parse path: "~~~" - --> $DIR/bad_remote.rs:18:10 + --> $DIR/bad_remote.rs:10:10 | -18 | #[derive(Serialize)] +10 | #[derive(Serialize)] | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/remote/enum_getter.rs b/test_suite/tests/ui/remote/enum_getter.rs index 94254e85..322ffdb4 100644 --- a/test_suite/tests/ui/remote/enum_getter.rs +++ b/test_suite/tests/ui/remote/enum_getter.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/remote/enum_getter.stderr b/test_suite/tests/ui/remote/enum_getter.stderr index d25ed26f..637955e4 100644 --- a/test_suite/tests/ui/remote/enum_getter.stderr +++ b/test_suite/tests/ui/remote/enum_getter.stderr @@ -1,7 +1,7 @@ error: #[serde(getter = "...")] is not allowed in an enum - --> $DIR/enum_getter.rs:18:10 + --> $DIR/enum_getter.rs:10:10 | -18 | #[derive(Serialize)] +10 | #[derive(Serialize)] | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/remote/missing_field.rs b/test_suite/tests/ui/remote/missing_field.rs index 5485d9fe..dba77f21 100644 --- a/test_suite/tests/ui/remote/missing_field.rs +++ b/test_suite/tests/ui/remote/missing_field.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/remote/missing_field.stderr b/test_suite/tests/ui/remote/missing_field.stderr index b3ada181..8f175836 100644 --- a/test_suite/tests/ui/remote/missing_field.stderr +++ b/test_suite/tests/ui/remote/missing_field.stderr @@ -1,7 +1,7 @@ error[E0063]: missing field `b` in initializer of `remote::S` - --> $DIR/missing_field.rs:20:18 + --> $DIR/missing_field.rs:12:18 | -20 | #[serde(remote = "remote::S")] +12 | #[serde(remote = "remote::S")] | ^^^^^^^^^^^ missing `b` error: aborting due to previous error diff --git a/test_suite/tests/ui/remote/nonremote_getter.rs b/test_suite/tests/ui/remote/nonremote_getter.rs index 05784478..23346d33 100644 --- a/test_suite/tests/ui/remote/nonremote_getter.rs +++ b/test_suite/tests/ui/remote/nonremote_getter.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/remote/nonremote_getter.stderr b/test_suite/tests/ui/remote/nonremote_getter.stderr index 3a121573..7b0fbdaa 100644 --- a/test_suite/tests/ui/remote/nonremote_getter.stderr +++ b/test_suite/tests/ui/remote/nonremote_getter.stderr @@ -1,8 +1,8 @@ error: #[serde(getter = "...")] can only be used in structs that have #[serde(remote = "...")] - --> $DIR/nonremote_getter.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/nonremote_getter.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/remote/unknown_field.rs b/test_suite/tests/ui/remote/unknown_field.rs index ad5f01f1..a71ee6dd 100644 --- a/test_suite/tests/ui/remote/unknown_field.rs +++ b/test_suite/tests/ui/remote/unknown_field.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/remote/unknown_field.stderr b/test_suite/tests/ui/remote/unknown_field.stderr index d401cfb6..0351b7e2 100644 --- a/test_suite/tests/ui/remote/unknown_field.stderr +++ b/test_suite/tests/ui/remote/unknown_field.stderr @@ -1,13 +1,13 @@ error[E0609]: no field `b` on type `&remote::S` - --> $DIR/unknown_field.rs:21:5 + --> $DIR/unknown_field.rs:13:5 | -21 | b: u8, +13 | b: u8, | ^ error[E0560]: struct `remote::S` has no field named `b` - --> $DIR/unknown_field.rs:21:5 + --> $DIR/unknown_field.rs:13:5 | -21 | b: u8, +13 | b: u8, | ^ field does not exist - did you mean `a`? error: aborting due to 2 previous errors diff --git a/test_suite/tests/ui/remote/wrong_de.rs b/test_suite/tests/ui/remote/wrong_de.rs index 1a3e4e43..7e370b99 100644 --- a/test_suite/tests/ui/remote/wrong_de.rs +++ b/test_suite/tests/ui/remote/wrong_de.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/remote/wrong_de.stderr b/test_suite/tests/ui/remote/wrong_de.stderr index 7b3dfc90..38743b40 100644 --- a/test_suite/tests/ui/remote/wrong_de.stderr +++ b/test_suite/tests/ui/remote/wrong_de.stderr @@ -1,12 +1,12 @@ error[E0308]: mismatched types - --> $DIR/wrong_de.rs:16:10 - | -16 | #[derive(Deserialize)] - | ^^^^^^^^^^^ expected u16, found u8 + --> $DIR/wrong_de.rs:8:10 + | +8 | #[derive(Deserialize)] + | ^^^^^^^^^^^ expected u16, found u8 help: you can cast an `u8` to `u16`, which will zero-extend the source value - | -16 | #[derive(Deserialize.into())] - | ^^^^^^^^^^^^^^^^^^ + | +8 | #[derive(Deserialize.into())] + | ^^^^^^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/remote/wrong_getter.rs b/test_suite/tests/ui/remote/wrong_getter.rs index 0cb5e0f5..b6da40d8 100644 --- a/test_suite/tests/ui/remote/wrong_getter.rs +++ b/test_suite/tests/ui/remote/wrong_getter.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/remote/wrong_getter.stderr b/test_suite/tests/ui/remote/wrong_getter.stderr index d52b58f9..b421bb01 100644 --- a/test_suite/tests/ui/remote/wrong_getter.stderr +++ b/test_suite/tests/ui/remote/wrong_getter.stderr @@ -1,7 +1,7 @@ error[E0308]: mismatched types - --> $DIR/wrong_getter.rs:24:10 + --> $DIR/wrong_getter.rs:16:10 | -24 | #[derive(Serialize)] +16 | #[derive(Serialize)] | ^^^^^^^^^ expected u8, found u16 | = note: expected type `&u8` diff --git a/test_suite/tests/ui/remote/wrong_ser.rs b/test_suite/tests/ui/remote/wrong_ser.rs index 1ce1815f..91bd234a 100644 --- a/test_suite/tests/ui/remote/wrong_ser.rs +++ b/test_suite/tests/ui/remote/wrong_ser.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/remote/wrong_ser.stderr b/test_suite/tests/ui/remote/wrong_ser.stderr index 8dc4de0c..741af571 100644 --- a/test_suite/tests/ui/remote/wrong_ser.stderr +++ b/test_suite/tests/ui/remote/wrong_ser.stderr @@ -1,7 +1,7 @@ error[E0308]: mismatched types - --> $DIR/wrong_ser.rs:18:10 + --> $DIR/wrong_ser.rs:10:10 | -18 | #[derive(Serialize)] +10 | #[derive(Serialize)] | ^^^^^^^^^ expected u8, found u16 | = note: expected type `&u8` diff --git a/test_suite/tests/ui/transparent/at_most_one.rs b/test_suite/tests/ui/transparent/at_most_one.rs index 728c6351..8810ce6d 100644 --- a/test_suite/tests/ui/transparent/at_most_one.rs +++ b/test_suite/tests/ui/transparent/at_most_one.rs @@ -1,11 +1,3 @@ -// Copyright 2018 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/transparent/at_most_one.stderr b/test_suite/tests/ui/transparent/at_most_one.stderr index cbb98e6c..76ad5923 100644 --- a/test_suite/tests/ui/transparent/at_most_one.stderr +++ b/test_suite/tests/ui/transparent/at_most_one.stderr @@ -1,8 +1,8 @@ error: #[serde(transparent)] requires struct to have at most one transparent field - --> $DIR/at_most_one.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/at_most_one.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/transparent/de_at_least_one.rs b/test_suite/tests/ui/transparent/de_at_least_one.rs index 9e6921a1..12b260e5 100644 --- a/test_suite/tests/ui/transparent/de_at_least_one.rs +++ b/test_suite/tests/ui/transparent/de_at_least_one.rs @@ -1,11 +1,3 @@ -// Copyright 2018 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/transparent/de_at_least_one.stderr b/test_suite/tests/ui/transparent/de_at_least_one.stderr index 8e663c22..fa04c007 100644 --- a/test_suite/tests/ui/transparent/de_at_least_one.stderr +++ b/test_suite/tests/ui/transparent/de_at_least_one.stderr @@ -1,8 +1,8 @@ error: #[serde(transparent)] requires at least one field that is neither skipped nor has a default - --> $DIR/de_at_least_one.rs:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/de_at_least_one.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/transparent/ser_at_least_one.rs b/test_suite/tests/ui/transparent/ser_at_least_one.rs index aaf5d0bc..b6455826 100644 --- a/test_suite/tests/ui/transparent/ser_at_least_one.rs +++ b/test_suite/tests/ui/transparent/ser_at_least_one.rs @@ -1,11 +1,3 @@ -// Copyright 2018 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/transparent/ser_at_least_one.stderr b/test_suite/tests/ui/transparent/ser_at_least_one.stderr index 3f3d2417..0b3cc87b 100644 --- a/test_suite/tests/ui/transparent/ser_at_least_one.stderr +++ b/test_suite/tests/ui/transparent/ser_at_least_one.stderr @@ -1,8 +1,8 @@ error: #[serde(transparent)] requires at least one field that is not skipped - --> $DIR/ser_at_least_one.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/ser_at_least_one.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/type-attribute/from.rs b/test_suite/tests/ui/type-attribute/from.rs index 6d585a7c..94f9b1f0 100644 --- a/test_suite/tests/ui/type-attribute/from.rs +++ b/test_suite/tests/ui/type-attribute/from.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/type-attribute/from.stderr b/test_suite/tests/ui/type-attribute/from.stderr index d470788b..3638329d 100644 --- a/test_suite/tests/ui/type-attribute/from.stderr +++ b/test_suite/tests/ui/type-attribute/from.stderr @@ -1,8 +1,8 @@ error: failed to parse type: from = "Option $DIR/from.rs:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/from.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/type-attribute/into.rs b/test_suite/tests/ui/type-attribute/into.rs index faba3aae..88cdf33f 100644 --- a/test_suite/tests/ui/type-attribute/into.rs +++ b/test_suite/tests/ui/type-attribute/into.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/type-attribute/into.stderr b/test_suite/tests/ui/type-attribute/into.stderr index e07d5b5c..a7cfaf95 100644 --- a/test_suite/tests/ui/type-attribute/into.stderr +++ b/test_suite/tests/ui/type-attribute/into.stderr @@ -1,8 +1,8 @@ error: failed to parse type: into = "Option $DIR/into.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/into.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/unknown-attribute/container.rs b/test_suite/tests/ui/unknown-attribute/container.rs index 69ef2f60..bd554f22 100644 --- a/test_suite/tests/ui/unknown-attribute/container.rs +++ b/test_suite/tests/ui/unknown-attribute/container.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/unknown-attribute/container.stderr b/test_suite/tests/ui/unknown-attribute/container.stderr index 6b026c6e..2a866665 100644 --- a/test_suite/tests/ui/unknown-attribute/container.stderr +++ b/test_suite/tests/ui/unknown-attribute/container.stderr @@ -1,8 +1,8 @@ error: unknown serde container attribute `abc` - --> $DIR/container.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/container.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/unknown-attribute/field.rs b/test_suite/tests/ui/unknown-attribute/field.rs index ea8c0bb9..3bd0d6cd 100644 --- a/test_suite/tests/ui/unknown-attribute/field.rs +++ b/test_suite/tests/ui/unknown-attribute/field.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/unknown-attribute/field.stderr b/test_suite/tests/ui/unknown-attribute/field.stderr index 36cdd6c6..de38fb24 100644 --- a/test_suite/tests/ui/unknown-attribute/field.stderr +++ b/test_suite/tests/ui/unknown-attribute/field.stderr @@ -1,8 +1,8 @@ error: unknown serde field attribute `abc` - --> $DIR/field.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/field.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/unknown-attribute/variant.rs b/test_suite/tests/ui/unknown-attribute/variant.rs index eb966984..4b4d462e 100644 --- a/test_suite/tests/ui/unknown-attribute/variant.rs +++ b/test_suite/tests/ui/unknown-attribute/variant.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/unknown-attribute/variant.stderr b/test_suite/tests/ui/unknown-attribute/variant.stderr index fd74fd0f..e785d7f0 100644 --- a/test_suite/tests/ui/unknown-attribute/variant.stderr +++ b/test_suite/tests/ui/unknown-attribute/variant.stderr @@ -1,8 +1,8 @@ error: unknown serde variant attribute `abc` - --> $DIR/variant.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/variant.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/with-variant/skip_de_newtype_field.rs b/test_suite/tests/ui/with-variant/skip_de_newtype_field.rs index faa3c76d..8c5a2996 100644 --- a/test_suite/tests/ui/with-variant/skip_de_newtype_field.rs +++ b/test_suite/tests/ui/with-variant/skip_de_newtype_field.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/with-variant/skip_de_newtype_field.stderr b/test_suite/tests/ui/with-variant/skip_de_newtype_field.stderr index 29288e48..b6a1757f 100644 --- a/test_suite/tests/ui/with-variant/skip_de_newtype_field.stderr +++ b/test_suite/tests/ui/with-variant/skip_de_newtype_field.stderr @@ -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:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/skip_de_newtype_field.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/with-variant/skip_de_struct_field.rs b/test_suite/tests/ui/with-variant/skip_de_struct_field.rs index fa0abc9d..4770d4ec 100644 --- a/test_suite/tests/ui/with-variant/skip_de_struct_field.rs +++ b/test_suite/tests/ui/with-variant/skip_de_struct_field.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/with-variant/skip_de_struct_field.stderr b/test_suite/tests/ui/with-variant/skip_de_struct_field.stderr index db405127..9f28bdad 100644 --- a/test_suite/tests/ui/with-variant/skip_de_struct_field.stderr +++ b/test_suite/tests/ui/with-variant/skip_de_struct_field.stderr @@ -1,8 +1,8 @@ error: variant `Struct` cannot have both #[serde(deserialize_with)] and a field `f1` marked with #[serde(skip_deserializing)] - --> $DIR/skip_de_struct_field.rs:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/skip_de_struct_field.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/with-variant/skip_de_tuple_field.rs b/test_suite/tests/ui/with-variant/skip_de_tuple_field.rs index 3889b49d..a3d078cb 100644 --- a/test_suite/tests/ui/with-variant/skip_de_tuple_field.rs +++ b/test_suite/tests/ui/with-variant/skip_de_tuple_field.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/with-variant/skip_de_tuple_field.stderr b/test_suite/tests/ui/with-variant/skip_de_tuple_field.stderr index 07cb2a9e..9f853fa4 100644 --- a/test_suite/tests/ui/with-variant/skip_de_tuple_field.stderr +++ b/test_suite/tests/ui/with-variant/skip_de_tuple_field.stderr @@ -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:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/skip_de_tuple_field.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/with-variant/skip_de_whole_variant.rs b/test_suite/tests/ui/with-variant/skip_de_whole_variant.rs index 523cfbc2..0a39212c 100644 --- a/test_suite/tests/ui/with-variant/skip_de_whole_variant.rs +++ b/test_suite/tests/ui/with-variant/skip_de_whole_variant.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/with-variant/skip_de_whole_variant.stderr b/test_suite/tests/ui/with-variant/skip_de_whole_variant.stderr index 718907d1..671deb1b 100644 --- a/test_suite/tests/ui/with-variant/skip_de_whole_variant.stderr +++ b/test_suite/tests/ui/with-variant/skip_de_whole_variant.stderr @@ -1,8 +1,8 @@ error: variant `Unit` cannot have both #[serde(deserialize_with)] and #[serde(skip_deserializing)] - --> $DIR/skip_de_whole_variant.rs:12:10 - | -12 | #[derive(Deserialize)] - | ^^^^^^^^^^^ + --> $DIR/skip_de_whole_variant.rs:4:10 + | +4 | #[derive(Deserialize)] + | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/with-variant/skip_ser_newtype_field.rs b/test_suite/tests/ui/with-variant/skip_ser_newtype_field.rs index 60181b5e..911f462d 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_newtype_field.rs +++ b/test_suite/tests/ui/with-variant/skip_ser_newtype_field.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/with-variant/skip_ser_newtype_field.stderr b/test_suite/tests/ui/with-variant/skip_ser_newtype_field.stderr index 8dbed4a4..4c292fb3 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_newtype_field.stderr +++ b/test_suite/tests/ui/with-variant/skip_ser_newtype_field.stderr @@ -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:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/skip_ser_newtype_field.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/with-variant/skip_ser_newtype_field_if.rs b/test_suite/tests/ui/with-variant/skip_ser_newtype_field_if.rs index b53ac2b3..28a11db6 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_newtype_field_if.rs +++ b/test_suite/tests/ui/with-variant/skip_ser_newtype_field_if.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/with-variant/skip_ser_newtype_field_if.stderr b/test_suite/tests/ui/with-variant/skip_ser_newtype_field_if.stderr index 64e76051..28144158 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_newtype_field_if.stderr +++ b/test_suite/tests/ui/with-variant/skip_ser_newtype_field_if.stderr @@ -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:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/skip_ser_newtype_field_if.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/with-variant/skip_ser_struct_field.rs b/test_suite/tests/ui/with-variant/skip_ser_struct_field.rs index 75d141a8..ab47dade 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_struct_field.rs +++ b/test_suite/tests/ui/with-variant/skip_ser_struct_field.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/with-variant/skip_ser_struct_field.stderr b/test_suite/tests/ui/with-variant/skip_ser_struct_field.stderr index e80bd35f..0a2d77d0 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_struct_field.stderr +++ b/test_suite/tests/ui/with-variant/skip_ser_struct_field.stderr @@ -1,8 +1,8 @@ error: variant `Struct` cannot have both #[serde(serialize_with)] and a field `f1` marked with #[serde(skip_serializing)] - --> $DIR/skip_ser_struct_field.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/skip_ser_struct_field.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/with-variant/skip_ser_struct_field_if.rs b/test_suite/tests/ui/with-variant/skip_ser_struct_field_if.rs index 42c319d9..6ccfad35 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_struct_field_if.rs +++ b/test_suite/tests/ui/with-variant/skip_ser_struct_field_if.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/with-variant/skip_ser_struct_field_if.stderr b/test_suite/tests/ui/with-variant/skip_ser_struct_field_if.stderr index 52dd82a7..2fb86627 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_struct_field_if.stderr +++ b/test_suite/tests/ui/with-variant/skip_ser_struct_field_if.stderr @@ -1,8 +1,8 @@ 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:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/skip_ser_struct_field_if.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/with-variant/skip_ser_tuple_field.rs b/test_suite/tests/ui/with-variant/skip_ser_tuple_field.rs index 97b931b9..45af4994 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_tuple_field.rs +++ b/test_suite/tests/ui/with-variant/skip_ser_tuple_field.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/with-variant/skip_ser_tuple_field.stderr b/test_suite/tests/ui/with-variant/skip_ser_tuple_field.stderr index 9e83c13a..ed671909 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_tuple_field.stderr +++ b/test_suite/tests/ui/with-variant/skip_ser_tuple_field.stderr @@ -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:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/skip_ser_tuple_field.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/with-variant/skip_ser_tuple_field_if.rs b/test_suite/tests/ui/with-variant/skip_ser_tuple_field_if.rs index ec771ca9..66021954 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_tuple_field_if.rs +++ b/test_suite/tests/ui/with-variant/skip_ser_tuple_field_if.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/with-variant/skip_ser_tuple_field_if.stderr b/test_suite/tests/ui/with-variant/skip_ser_tuple_field_if.stderr index dd777ff1..748826c7 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_tuple_field_if.stderr +++ b/test_suite/tests/ui/with-variant/skip_ser_tuple_field_if.stderr @@ -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:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/skip_ser_tuple_field_if.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/ui/with-variant/skip_ser_whole_variant.rs b/test_suite/tests/ui/with-variant/skip_ser_whole_variant.rs index c667d81f..d140c925 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_whole_variant.rs +++ b/test_suite/tests/ui/with-variant/skip_ser_whole_variant.rs @@ -1,11 +1,3 @@ -// Copyright 2017 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate serde_derive; diff --git a/test_suite/tests/ui/with-variant/skip_ser_whole_variant.stderr b/test_suite/tests/ui/with-variant/skip_ser_whole_variant.stderr index 82f8dddd..56b18a9d 100644 --- a/test_suite/tests/ui/with-variant/skip_ser_whole_variant.stderr +++ b/test_suite/tests/ui/with-variant/skip_ser_whole_variant.stderr @@ -1,8 +1,8 @@ error: variant `Unit` cannot have both #[serde(serialize_with)] and #[serde(skip_serializing)] - --> $DIR/skip_ser_whole_variant.rs:12:10 - | -12 | #[derive(Serialize)] - | ^^^^^^^^^ + --> $DIR/skip_ser_whole_variant.rs:4:10 + | +4 | #[derive(Serialize)] + | ^^^^^^^^^ error: aborting due to previous error diff --git a/test_suite/tests/unstable/mod.rs b/test_suite/tests/unstable/mod.rs index 9aba301c..b66d2234 100644 --- a/test_suite/tests/unstable/mod.rs +++ b/test_suite/tests/unstable/mod.rs @@ -1,11 +1,3 @@ -// Copyright 2018 Serde Developers -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use serde_test::{assert_tokens, Token}; #[test]