diff --git a/LICENSE-MIT b/LICENSE-MIT index 39d4bdb..31aa793 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/src/de.rs b/src/de.rs index ec5f9cb..b2b87af 100644 --- a/src/de.rs +++ b/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. - //! Deserialize JSON data to a Rust data structure. use std::io; diff --git a/src/error.rs b/src/error.rs index 61636dc..778ce45 100644 --- a/src/error.rs +++ b/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. - //! When serializing or deserializing JSON goes wrong. use std::error; diff --git a/src/iter.rs b/src/iter.rs index 344e8a4..1a9a954 100644 --- a/src/iter.rs +++ b/src/iter.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::io; pub struct LineColIterator { diff --git a/src/lib.rs b/src/lib.rs index 7903033..fa07f1b 100644 --- a/src/lib.rs +++ b/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 JSON //! //! JSON is a ubiquitous open-standard format that uses human-readable text to diff --git a/src/macros.rs b/src/macros.rs index ee163fc..1b0fa0b 100644 --- a/src/macros.rs +++ b/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. - /// Construct a `serde_json::Value` from a JSON literal. /// /// ```rust diff --git a/src/map.rs b/src/map.rs index dd28c75..c06dcc8 100644 --- a/src/map.rs +++ b/src/map.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 map of String to serde_json::Value. //! //! By default the map is backed by a [`BTreeMap`]. Enable the `preserve_order` diff --git a/src/number.rs b/src/number.rs index 89d0997..999124e 100644 --- a/src/number.rs +++ b/src/number.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 error::Error; use serde::de::{self, Unexpected, Visitor}; use serde::{Deserialize, Deserializer, Serialize, Serializer}; diff --git a/src/read.rs b/src/read.rs index 821d2a6..71b0504 100644 --- a/src/read.rs +++ b/src/read.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::ops::Deref; use std::{char, cmp, io, str}; diff --git a/src/ser.rs b/src/ser.rs index c71e52c..d0fc66a 100644 --- a/src/ser.rs +++ b/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. - //! Serialize a Rust data structure into JSON data. use std::fmt; diff --git a/src/value/de.rs b/src/value/de.rs index f70589b..a1f40cf 100644 --- a/src/value/de.rs +++ b/src/value/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 std::borrow::Cow; use std::fmt; use std::slice; diff --git a/src/value/from.rs b/src/value/from.rs index 2ac7ec1..f3f1828 100644 --- a/src/value/from.rs +++ b/src/value/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. - use std::borrow::Cow; use super::Value; diff --git a/src/value/index.rs b/src/value/index.rs index 87c61eb..2f4f7b4 100644 --- a/src/value/index.rs +++ b/src/value/index.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; use std::ops; diff --git a/src/value/mod.rs b/src/value/mod.rs index d4f28ce..0224fb1 100644 --- a/src/value/mod.rs +++ b/src/value/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. - //! The Value enum, a loosely typed way of representing any valid JSON value. //! //! # Constructing JSON diff --git a/src/value/partial_eq.rs b/src/value/partial_eq.rs index ef67f5c..cfcf957 100644 --- a/src/value/partial_eq.rs +++ b/src/value/partial_eq.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 super::Value; fn eq_i64(value: &Value, other: i64) -> bool { diff --git a/src/value/ser.rs b/src/value/ser.rs index c5efd28..b0e09be 100644 --- a/src/value/ser.rs +++ b/src/value/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::Impossible; use serde::{self, Serialize}; diff --git a/tests/compiletest.rs b/tests/compiletest.rs index b85a2b6..c554d5a 100644 --- a/tests/compiletest.rs +++ b/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. - extern crate compiletest_rs as compiletest; #[test] diff --git a/tests/deps/src/lib.rs b/tests/deps/src/lib.rs index 78f6f4d..e63ee9d 100644 --- a/tests/deps/src/lib.rs +++ b/tests/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/tests/macros/mod.rs b/tests/macros/mod.rs index d104eea..2c11ce9 100644 --- a/tests/macros/mod.rs +++ b/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! json_str { ([]) => { "[]" diff --git a/tests/preserve_order.rs b/tests/preserve_order.rs index 7095d78..beea1f4 100644 --- a/tests/preserve_order.rs +++ b/tests/preserve_order.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_json; use serde_json::{from_str, Value}; diff --git a/tests/stream.rs b/tests/stream.rs index 1bc653a..7127b25 100644 --- a/tests/stream.rs +++ b/tests/stream.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(not(feature = "preserve_order"))] extern crate serde; diff --git a/tests/test.rs b/tests/test.rs index da56539..46b3396 100644 --- a/tests/test.rs +++ b/tests/test.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(not(feature = "preserve_order"))] #![cfg_attr(feature = "cargo-clippy", allow(float_cmp, unreadable_literal))] #![cfg_attr(feature = "trace-macros", feature(trace_macros))] diff --git a/tests/ui/missing_colon.rs b/tests/ui/missing_colon.rs index e23a38a..98d4f2c 100644 --- a/tests/ui/missing_colon.rs +++ b/tests/ui/missing_colon.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_json; diff --git a/tests/ui/missing_colon.stderr b/tests/ui/missing_colon.stderr index 2393529..b854d44 100644 --- a/tests/ui/missing_colon.stderr +++ b/tests/ui/missing_colon.stderr @@ -1,10 +1,10 @@ error: unexpected end of macro invocation - --> $DIR/missing_colon.rs:13:5 - | -13 | json!({ "a" }); - | ^^^^^^^^^^^^^^^ missing tokens in macro arguments - | - = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) + --> $DIR/missing_colon.rs:5:5 + | +5 | json!({ "a" }); + | ^^^^^^^^^^^^^^^ missing tokens in macro arguments + | + = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error: aborting due to previous error diff --git a/tests/ui/missing_value.rs b/tests/ui/missing_value.rs index 12f6449..d72a49d 100644 --- a/tests/ui/missing_value.rs +++ b/tests/ui/missing_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_json; diff --git a/tests/ui/missing_value.stderr b/tests/ui/missing_value.stderr index ea0f8b0..6d088ed 100644 --- a/tests/ui/missing_value.stderr +++ b/tests/ui/missing_value.stderr @@ -1,10 +1,10 @@ error: unexpected end of macro invocation - --> $DIR/missing_value.rs:13:5 - | -13 | json!({ "a" : }); - | ^^^^^^^^^^^^^^^^^ missing tokens in macro arguments - | - = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) + --> $DIR/missing_value.rs:5:5 + | +5 | json!({ "a" : }); + | ^^^^^^^^^^^^^^^^^ missing tokens in macro arguments + | + = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error: aborting due to previous error diff --git a/tests/ui/not_found.rs b/tests/ui/not_found.rs index 4e84cae..08b802f 100644 --- a/tests/ui/not_found.rs +++ b/tests/ui/not_found.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_json; diff --git a/tests/ui/not_found.stderr b/tests/ui/not_found.stderr index 106fc21..b544b37 100644 --- a/tests/ui/not_found.stderr +++ b/tests/ui/not_found.stderr @@ -1,8 +1,8 @@ error[E0425]: cannot find value `x` in this scope - --> $DIR/not_found.rs:13:19 - | -13 | json!({ "a" : x }); - | ^ not found in this scope + --> $DIR/not_found.rs:5:19 + | +5 | json!({ "a" : x }); + | ^ not found in this scope error: aborting due to previous error diff --git a/tests/ui/parse_expr.rs b/tests/ui/parse_expr.rs index 5ca5826..bcc58ae 100644 --- a/tests/ui/parse_expr.rs +++ b/tests/ui/parse_expr.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_json; diff --git a/tests/ui/parse_expr.stderr b/tests/ui/parse_expr.stderr index 56841c3..76bbcaa 100644 --- a/tests/ui/parse_expr.stderr +++ b/tests/ui/parse_expr.stderr @@ -1,10 +1,10 @@ error: unexpected end of macro invocation - --> $DIR/parse_expr.rs:13:5 - | -13 | json!({ "a" : ~ }); - | ^^^^^^^^^^^^^^^^^^^ missing tokens in macro arguments - | - = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) + --> $DIR/parse_expr.rs:5:5 + | +5 | json!({ "a" : ~ }); + | ^^^^^^^^^^^^^^^^^^^ missing tokens in macro arguments + | + = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error: aborting due to previous error diff --git a/tests/ui/parse_key.rs b/tests/ui/parse_key.rs index a1b6848..e7f4e27 100644 --- a/tests/ui/parse_key.rs +++ b/tests/ui/parse_key.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_json; diff --git a/tests/ui/parse_key.stderr b/tests/ui/parse_key.stderr index 24674dc..c1485a0 100644 --- a/tests/ui/parse_key.stderr +++ b/tests/ui/parse_key.stderr @@ -1,8 +1,8 @@ error[E0609]: no field `s` on type `&'static str` - --> $DIR/parse_key.rs:13:16 - | -13 | json!({ "".s : true }); - | ^ + --> $DIR/parse_key.rs:5:16 + | +5 | json!({ "".s : true }); + | ^ error: aborting due to previous error diff --git a/tests/ui/unexpected_after_array_element.rs b/tests/ui/unexpected_after_array_element.rs index d226138..f8f3e91 100644 --- a/tests/ui/unexpected_after_array_element.rs +++ b/tests/ui/unexpected_after_array_element.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_json; diff --git a/tests/ui/unexpected_after_array_element.stderr b/tests/ui/unexpected_after_array_element.stderr index b092991..5b45a0a 100644 --- a/tests/ui/unexpected_after_array_element.stderr +++ b/tests/ui/unexpected_after_array_element.stderr @@ -1,8 +1,8 @@ error: no rules expected the token `=>` - --> $DIR/unexpected_after_array_element.rs:13:18 - | -13 | json!([ true => ]); - | ^^ no rules expected this token in macro call + --> $DIR/unexpected_after_array_element.rs:5:18 + | +5 | json!([ true => ]); + | ^^ no rules expected this token in macro call error: aborting due to previous error diff --git a/tests/ui/unexpected_after_map_entry.rs b/tests/ui/unexpected_after_map_entry.rs index a6034e0..4018541 100644 --- a/tests/ui/unexpected_after_map_entry.rs +++ b/tests/ui/unexpected_after_map_entry.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_json; diff --git a/tests/ui/unexpected_after_map_entry.stderr b/tests/ui/unexpected_after_map_entry.stderr index 49894af..df58a06 100644 --- a/tests/ui/unexpected_after_map_entry.stderr +++ b/tests/ui/unexpected_after_map_entry.stderr @@ -1,8 +1,8 @@ error: no rules expected the token `=>` - --> $DIR/unexpected_after_map_entry.rs:13:23 - | -13 | json!({ "k": true => }); - | ^^ no rules expected this token in macro call + --> $DIR/unexpected_after_map_entry.rs:5:23 + | +5 | json!({ "k": true => }); + | ^^ no rules expected this token in macro call error: aborting due to previous error diff --git a/tests/ui/unexpected_colon.rs b/tests/ui/unexpected_colon.rs index af25adc..e9a307e 100644 --- a/tests/ui/unexpected_colon.rs +++ b/tests/ui/unexpected_colon.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_json; diff --git a/tests/ui/unexpected_colon.stderr b/tests/ui/unexpected_colon.stderr index 5fc1bf6..b379d4e 100644 --- a/tests/ui/unexpected_colon.stderr +++ b/tests/ui/unexpected_colon.stderr @@ -1,8 +1,8 @@ error: no rules expected the token `:` - --> $DIR/unexpected_colon.rs:13:13 - | -13 | json!({ : true }); - | ^ no rules expected this token in macro call + --> $DIR/unexpected_colon.rs:5:13 + | +5 | json!({ : true }); + | ^ no rules expected this token in macro call error: aborting due to previous error diff --git a/tests/ui/unexpected_comma.rs b/tests/ui/unexpected_comma.rs index df01aed..66d106d 100644 --- a/tests/ui/unexpected_comma.rs +++ b/tests/ui/unexpected_comma.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_json; diff --git a/tests/ui/unexpected_comma.stderr b/tests/ui/unexpected_comma.stderr index 921ef87..274cb19 100644 --- a/tests/ui/unexpected_comma.stderr +++ b/tests/ui/unexpected_comma.stderr @@ -1,8 +1,8 @@ error: no rules expected the token `,` - --> $DIR/unexpected_comma.rs:13:17 - | -13 | json!({ "a" , "b": true }); - | ^ no rules expected this token in macro call + --> $DIR/unexpected_comma.rs:5:17 + | +5 | json!({ "a" , "b": true }); + | ^ no rules expected this token in macro call error: aborting due to previous error