Copyright/license headers

The following changes are included:

- Delete per-file license notices at the top of each file.
- Delete the first paragraph of LICENSE-MIT (an inaccurate
  pseudo-copyright line), leaving only the text of the MIT license.

Nothing about the license of Serde code has changed, only our
understanding of how to correctly communicate the license has changed.

This mirrors an equivalent change being applied in the rust-lang/rust
repository.

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

src/de.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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;

src/error.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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;

src/iter.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use std::io;
 
 pub struct LineColIterator<I> {

src/lib.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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

src/macros.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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

src/map.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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`

src/number.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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};

src/read.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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};
 

src/ser.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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;

src/value/de.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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;

src/value/from.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use std::borrow::Cow;
 
 use super::Value;

src/value/index.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use std::fmt;
 use std::ops;
 

src/value/mod.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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

src/value/partial_eq.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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 {

src/value/ser.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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};
 

tests/compiletest.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 extern crate compiletest_rs as compiletest;
 
 #[test]

tests/deps/src/lib.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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.  ===]
 #![====================================================*/)]

tests/macros/mod.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 macro_rules! json_str {
     ([]) => {
         "[]"

tests/preserve_order.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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};

tests/stream.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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;

tests/test.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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))]

tests/ui/missing_colon.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[macro_use]
 extern crate serde_json;
 

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
 

tests/ui/missing_value.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[macro_use]
 extern crate serde_json;
 

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
 

tests/ui/not_found.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[macro_use]
 extern crate serde_json;
 

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
 

tests/ui/parse_expr.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[macro_use]
 extern crate serde_json;
 

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
 

tests/ui/parse_key.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[macro_use]
 extern crate serde_json;
 

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
 

tests/ui/unexpected_after_array_element.rs

@@ -1,11 +1,3 @@
-// Copyright 2018 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[macro_use]
 extern crate serde_json;
 

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
 

tests/ui/unexpected_after_map_entry.rs

@@ -1,11 +1,3 @@
-// Copyright 2018 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[macro_use]
 extern crate serde_json;
 

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
 

tests/ui/unexpected_colon.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[macro_use]
 extern crate serde_json;
 

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
 

tests/ui/unexpected_comma.rs

@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[macro_use]
 extern crate serde_json;
 

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