Uh oh!
There was an error while loading. Please reload this page.
REMOVE ALL THE LICENSE THINGS - #53654
Conversation
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. |
rust-highfive
commented
Aug 24, 2018
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-i-m
commented
Aug 24, 2018
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: forfilein`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'$filedone |
Mark-Simulacrum
commented
Aug 24, 2018
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. |
mark-i-m
commented
Aug 24, 2018
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. |
mark-i-m
commented
Aug 24, 2018
So I tried running my script on a clean cloned repo (without submodules): $ git status | wc -l10889So the diff will be about 100k lines... Do you still want me to put it all in one commit? |
BurntPizza
commented
Aug 24, 2018
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. |
mark-i-m
commented
Aug 24, 2018
Ok, I will push a second commit shortly with the remaining licenses. Thanks! |
mark-i-m
commented
Aug 24, 2018
This is by far the largest PR I've ever made 😝 |
rust-highfive
commented
Aug 24, 2018
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 |
joshtriplett
commented
Aug 24, 2018
@BurntPizza Eventually, but not until the existing ones are removed. |
RalfJung
commented
Aug 24, 2018
Warning: Conflict ahead with #53609... whoever lands first... |
mark-i-m
commented
Aug 24, 2018
Thanks for the heads up! |
bors
commented
Aug 24, 2018
☔ The latest upstream changes (presumably #53044) made this pull request unmergeable. Please resolve the merge conflicts. |
mark-i-m
commented
Aug 24, 2018
Rebased. Still blocked on #53617, which is part of a rollup. |
mark-i-m
commented
Aug 24, 2018
Ugh... I messed up the rebase. |
mark-i-m
commented
Aug 24, 2018
@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 |
mark-i-m
commented
Aug 24, 2018
Hmm... I see. So would you recommend going on a sub-crate by sub-crate bases, as I was originally going to do? |
rust-highfive
commented
Aug 24, 2018
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 |
petrochenkov
commented
Aug 24, 2018
No, my only recommendation is to cooperate with the infra team on this PR. |
Centril
commented
Aug 24, 2018
So I agree that we should do it in one PR for the reasons you mention... |
Mark-Simulacrum
commented
Aug 24, 2018
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. |
mark-i-m
commented
Aug 24, 2018
I don't mind waiting |
matthiaskrgr
commented
Aug 24, 2018
Hi, could you add the bash script you ran into the commit message? |
lovesegfault
commented
Aug 29, 2018
I think this shouldn't be blocked anymore since #53654 has been merged? |
mark-i-m
commented
Aug 29, 2018
Mark-Simulacrum
commented
Aug 29, 2018
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. |
Apparently copyright notices are no longer necessary apparently. (See rust-lang#43498 and rust-lang#53654.)
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.