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.

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

sync license files with rustc repo #1846

Merged
merged 1 commit into from
Jul 6, 2021
Merged

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Jul 5, 2021

@Mark-Simulacrum pointed out that our license files are slightly different from those in rustc. This syncs them.

The question is... is this a thing we can just do?^^

@bjorn3
Copy link
Member

bjorn3 commented Jul 5, 2021

I guess this will need permission from all contributors, though IANAL.

@RalfJung
Copy link
Member Author

RalfJung commented Jul 5, 2021

This is just removing a copyright line and an "appendix", does that really change the license? I'd assume "appendix" means we are done with the normative part of the license... but of course IANAL either ;)

@@ -1,5 +1,3 @@
Copyright (c) 2016 The Miri Developers
Copy link
Contributor

Choose a reason for hiding this comment

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

Doesn't removing this conflict with "The above copyright notice... shall be included in all copies or substantial portions of the Software"? Although it seems that this notice was removed from rustc

Copy link
Member Author

Choose a reason for hiding this comment

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

This was changed in rustc in rust-lang/rust#43498 without explicit buy-in from all contributors.

So this particular change I think we are safe to do in Miri as well.

@@ -174,28 +174,3 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.
Copy link
Member Author

Choose a reason for hiding this comment

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

The appendix was removed in rustc in rust-lang/rust#67734, without explicit buy-in from all contributors. So I think we are safe to do the same in Miri as well.

@RalfJung
Copy link
Member Author

RalfJung commented Jul 6, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Jul 6, 2021

📌 Commit ca782df has been approved by RalfJung

@bors
Copy link
Contributor

bors commented Jul 6, 2021

⌛ Testing commit ca782df with merge 4a30b68...

@bors
Copy link
Contributor

bors commented Jul 6, 2021

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing 4a30b68 to master...

@bors bors merged commit 4a30b68 into rust-lang:master Jul 6, 2021
@RalfJung RalfJung deleted the license branch July 6, 2021 13:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants