REMOVE ALL THE LICENSE THINGS #53654
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rust-highfive
added
the
S-waiting-on-review
|
Looks good to me, let's go ahead with this as soon as the tidy change goes in. Please feel free to r=me once that goes in. |
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
For future reference, this is the bash script I am using to delete the licenses. It deletes everything in all subdirectories of the current working directory recursively: for file in `find -type f -name '*.rs'` ; do
sed -i -re '/\/\/ Copyright [0-9-]+ The Rust Project Developers. See the COPYRIGHT/d' $file
sed -i -re '/\/\/ file at the top-level directory of this distribution and at/d' $file
sed -i -re 'N;/\/\/ http:\/\/rust-lang.org\/COPYRIGHT.\n\/\//d' $file
sed -i -re '/\/\/ Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or/d' $file
sed -i -re '/\/\/ http:\/\/www.apache.org\/licenses\/LICENSE-2.0> or the MIT license/d' $file
sed -i -re '/\/\/ <LICENSE-MIT or http:\/\/opensource.org\/licenses\/MIT>, at your/d' $file
sed -i -re '/\/\/ option. This file may not be copied, modified, or distributed/d' $file
sed -i -re '/\/\/ except according to those terms./d' $file
sed -i '/./,$!d' $file
done |
|
I would prefer that we do all of the licenses at once rather than in multiple PRs to keep consistency, and also don't see that there's much point in waiting unless I'm missing something. We might/will end up with maybe 2 commits but I'd prefer to avoid doing rote changes like this incrementally since it usually creates dozens of commits that aren't very interesting. |
We need to wait for the other PR. Otherwise, travis will fail.
I fine with this, but some poor soul has to review thousands of lines of deleted licenses, and breaking it up might make it a bit easier. Let me know what you think. |
|
So I tried running my script on a clean cloned repo (without submodules): $ git status | wc -l
10889So the diff will be about 100k lines... Do you still want me to put it all in one commit? |
|
You can add numbered commits for keeping track of review status, and rebase them all into one at the end when merging the PR. |
|
Right, we have to wait for a separate PR, but there's no reason to split up this PR so to speak. I am willing to volunteer to verify the diff, which should also be relatively simple to do locally via some rg and uniq I think. |
|
Ok, I will push a second commit shortly with the remaining licenses. Thanks! |
mark-i-m
changed the title
|
This is by far the largest PR I've ever made 😝 |
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
@Mark-Simulacrum Could even change |
|
@BurntPizza Eventually, but not until the existing ones are removed. |
Closed
|
Warning: Conflict ahead with #53609... whoever lands first... |
|
Thanks for the heads up! |
kennytm
added
S-blocked
|
☔ The latest upstream changes (presumably #53044) made this pull request unmergeable. Please resolve the merge conflicts. |
|
Rebased. Still blocked on #53617, which is part of a rollup. |
|
Ugh... I messed up the rebase. |
|
@Mark-Simulacrum Hmm... actually I think this might be harder than expected. All of the line numbers in the .stderr files of test will need to be updated. |
|
@mark-i-m |
|
Hmm... I see. So would you recommend going on a sub-crate by sub-crate bases, as I was originally going to do? |
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
No, my only recommendation is to cooperate with the infra team on this PR. |
So I agree that we should do it in one PR for the reasons you mention... |
|
Landing this post-edition seems fine, I don't have a strong opinion. With regards to closing the tree, we certainly can, but as @Centril mentions this might not be the time. I don't really have strong opinions in that regard. |
|
I don't mind waiting |
|
Hi, could you add the bash script you ran into the commit message? |
|
I think this shouldn't be blocked anymore since #53654 has been merged? |
|
@bemeurer I think you mean #53617. That's true, but we are waiting for the edition release because changing this many files (especially the tests) will require some coordination to avoid conflicts. |
|
I'm going to close this for now since I think it's going to need to be recreated anyway in a few weeks/months; probably ~weeks since once RC 1 goes out edition-related development in this repository should slow down somewhat. |
pnkfelix
added a commit
to pnkfelix/rust
that referenced
this pull request
Sep 17, 2018
Apparently copyright notices are no longer necessary apparently. (See rust-lang#43498 and rust-lang#53654.)
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pursuant to #53617 and #43498, all license headers are heretofore banished!
r? @joshtriplett
This is blocked on #53617There are no actual changes in this PR, just removing all of the licenses.
I will submit more of these if this seems to you like an ok way to proceed. I tried to keep it all in one commit to avoid cluttering the git history.
EDIT: copied from below. Here is the script I used to remove the headers:
EDIT2: This is currently blocked on the 2018 edition release. Removing all of these licenses will require locking the tree briefly, and we don't want to slow down higher-priority work on the edition right now.