Skip to content

Commit 0565653

Browse files
committed
Auto merge of #43498 - joshtriplett:fix-notices, r=aturon
Copyright/license headers (As discussed with @aturon and @est31. CC @rust-lang/core.) Currently, rust-lang/rust includes notices that say things like ``` The Rust Project is copyright 2010, The Rust Project Developers. ``` or ``` Copyright (c) 2010 The Rust Project Developers ``` or ``` // Copyright 2017 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. ``` These notices aren't accurate. "Copyright YYYY Some Name" has a specific legal meaning, and "The Rust Project Developers" isn't a legal entity. In practice, the actual legal structure is that all Rust contributors retain their copyrights when contributing to Rust, and just license them under MIT/Apache-2.0. Our legal notices should reflect that. This came up because of RFC 2044, which proposed fixing this for the RFC repository. That effort started out by copying the rust-lang/rust notices, propagating this issue. Based on discussion with @aturon, the two of us propose the following: - Delete the per-file notices entirely, for any files licensed under the standard terms. (Keep notices for anything that's *not* MIT/Apache-2.0.) - An alternative to that would be to just delete the first paragraph of the standard notice, and keep the second paragraph that points to the MIT and Apache 2.0 licenses. - Delete the first paragraph of LICENSE-MIT (the inaccurate pseudo-copyright line), leaving only the text of the MIT license. - Edit the COPYRIGHT file to more accurately describe the situation (changing the pseudo-copyright line immediately under "longer version", and editing the text that starts with "additional copyright may be ...", to just always state that copyrights are retained by the Rust contributors, and licensed under MIT/Apache-2.0 (with the exceptions to that explicitly noted in that file). If @rust-lang/core is fine with this proposal, I'd be happy to provide a pull request with the proposed fixes.
2 parents f60d373 + f1de27f commit 0565653

File tree

2 files changed

+10
-33
lines changed

2 files changed

+10
-33
lines changed

COPYRIGHT

+10-31
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,17 @@ terms.
66

77
Longer version:
88

9-
The Rust Project is copyright 2010, The Rust Project
10-
Developers.
9+
Copyrights in the Rust project are retained by their contributors. No
10+
copyright assignment is required to contribute to the Rust project.
1111

12-
Licensed under the Apache License, Version 2.0
13-
<LICENSE-APACHE or
14-
http://www.apache.org/licenses/LICENSE-2.0> or the MIT
15-
license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
16-
at your option. All files in the project carrying such
17-
notice may not be copied, modified, or distributed except
18-
according to those terms.
12+
Some files include explicit copyright notices and/or license notices.
13+
For full authorship information, see AUTHORS.txt and the version control
14+
history.
15+
16+
Except as otherwise noted (below and/or in individual files), Rust is
17+
licensed under the Apache License, Version 2.0 <LICENSE-APACHE> or
18+
<http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
19+
<LICENSE-MIT> or <http://opensource.org/licenses/MIT>, at your option.
1920

2021

2122
The Rust Project includes packages written by third parties.
@@ -282,25 +283,3 @@ their own copyright notices and license terms:
282283
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
283284
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
284285
OF SUCH DAMAGE.
285-
286-
* Additional copyright may be retained by contributors other
287-
than Mozilla, the Rust Project Developers, or the parties
288-
enumerated in this file. Such copyright can be determined
289-
on a case-by-case basis by examining the author of each
290-
portion of a file in the revision-control commit records
291-
of the project, or by consulting representative comments
292-
claiming copyright ownership for a file.
293-
294-
For example, the text:
295-
296-
"Copyright (c) 2011 Google Inc."
297-
298-
appears in some files, and these files thereby denote
299-
that their author and copyright-holder is Google Inc.
300-
301-
In all such cases, the absence of explicit licensing text
302-
indicates that the contributor chose to license their work
303-
for distribution under identical terms to those Mozilla
304-
has chosen for the collective work, enumerated at the top
305-
of this file. The only difference is the retention of
306-
copyright itself, held by the contributor.

LICENSE-MIT

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
Copyright (c) 2010 The Rust Project Developers
2-
31
Permission is hereby granted, free of charge, to any
42
person obtaining a copy of this software and associated
53
documentation files (the "Software"), to deal in the

0 commit comments

Comments
 (0)