Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Copyright/license headers #43498

Merged
merged 2 commits into from
Jul 27, 2017
Merged

Copyright/license headers #43498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a8807e
LICENSE-MIT: Remove inaccurate (misattributed) copyright notice
joshtriplett Jul 26, 2017
f1de27f
COPYRIGHT: Provide a better explanation of Rust copyrights
joshtriplett Jul 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 10 additions & 31 deletions COPYRIGHT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,17 @@ terms.

Longer version:

The Rust Project is copyright 2010, The Rust Project
Developers.
Copyrights in the Rust project are retained by their contributors. No
copyright assignment is required to contribute to the Rust project.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you include the "No copyright assignment is required" sentence, you should also talk about what is required, namely that by contributing, you agree to license the content under the given licenses and assert that you have the legal authority to license the content, or the content was given to you by a third party... or something like that.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd just remove the sentence.

Copy link
Member Author

@joshtriplett joshtriplett Jul 27, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's typically implicit when contributing to an Open Source project. Most projects don't state that explicitly. And I would suggest that we avoid explicitly writing language like "by contributing ... you agree ...", because that starts to look more like a contract or CLA.

Rust doesn't use anything like the DCO, either.


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. All files in the project carrying such
notice may not be copied, modified, or distributed except
according to those terms.
Some files include explicit copyright notices and/or license notices.
For full authorship information, see AUTHORS.txt and the version control
history.

Except as otherwise noted (below and/or in individual files), Rust is
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.


The Rust Project includes packages written by third parties.
Expand Down Expand Up @@ -282,25 +283,3 @@ their own copyright notices and license terms:
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
OF SUCH DAMAGE.

* Additional copyright may be retained by contributors other
than Mozilla, the Rust Project Developers, or the parties
enumerated in this file. Such copyright can be determined
on a case-by-case basis by examining the author of each
portion of a file in the revision-control commit records
of the project, or by consulting representative comments
claiming copyright ownership for a file.

For example, the text:

"Copyright (c) 2011 Google Inc."

appears in some files, and these files thereby denote
that their author and copyright-holder is Google Inc.

In all such cases, the absence of explicit licensing text
indicates that the contributor chose to license their work
for distribution under identical terms to those Mozilla
has chosen for the collective work, enumerated at the top
of this file. The only difference is the retention of
copyright itself, held by the contributor.
2 changes: 0 additions & 2 deletions LICENSE-MIT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Copyright (c) 2010 The Rust Project Developers
Copy link

@wking wking Jan 11, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm having trouble squaring this removal with the “The above copyright notice and this permission notice shall be included…” sentence below. @joshtriplett, do you think that will be a problem, now that there is no longer an above copyright notice?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't believe so, no. The requirement is to reproduce what's there; if something isn't there you don't need to reproduce it.


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
Expand Down