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

Remove appendix from Apache license #67734

Merged
merged 1 commit into from
Jan 21, 2020
Merged

Conversation

XAMPPRocky
Copy link
Member

Looking at the codebase I noticed an oddity, in that the appendix of how use the Apache licence is still contained in the licence file. We don't put licence headers at the top of all of our files so I don't think we need to keep this. Alternatively we could delete everything above line 191 to have a shorter licence file.

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 30, 2019
@XAMPPRocky XAMPPRocky changed the title Remove appendix from LICENCE-APACHE Remove appendix from Apache license Dec 30, 2019
@alexcrichton
Copy link
Member

r? @skade

would you be ok taking a look at this?

@Mark-Simulacrum
Copy link
Member

Not sure why I can't assign to @skade, they should be somewhere in the Rust org I feel.

I've pinged them on Discord.

@skade
Copy link
Contributor

skade commented Jan 19, 2020

This is unproblematic and makes sense. The license itself states:

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

Of which the Appendix is not a part. It makes sense to remove it. It may also confuse people, as we don't apply the license the way it is proposed in there.

r+ @alexcrichton

@XAMPPRocky
Copy link
Member Author

@Mark-Simulacrum Looking at /team, @skade is in community, community-events, and core-observers. core-observers does have bors review permissions, but it doesn't seem like that works.

@Mark-Simulacrum
Copy link
Member

@bors r=skade

@bors
Copy link
Contributor

bors commented Jan 20, 2020

📌 Commit 2ccf65c has been approved by skade

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 20, 2020
@bors
Copy link
Contributor

bors commented Jan 20, 2020

⌛ Testing commit 2ccf65c with merge 658e0817734367860daca4f8e9f8310f14861399...

@rust-highfive
Copy link
Collaborator

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

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 @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Jan 20, 2020

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 20, 2020
@Mark-Simulacrum
Copy link
Member

@bors retry install of msys2 was NOT successful

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 20, 2020
@Mark-Simulacrum
Copy link
Member

@bors rollup=always

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 20, 2020
Remove appendix from Apache license

Looking at the codebase I noticed an oddity, in that the appendix of how use the Apache licence is still contained in the licence file. We don't put licence headers at the top of all of our files so I don't think we need to keep this. Alternatively we could delete everything above line 191 to have a shorter licence file.
bors added a commit that referenced this pull request Jan 20, 2020
Rollup of 8 pull requests

Successful merges:

 - #67734 (Remove appendix from Apache license)
 - #67795 (Cleanup formatting code)
 - #68290 (Fix some tests failing in `--pass check` mode)
 - #68297 ( Filter and test predicates using `normalize_and_test_predicates` for const-prop)
 - #68302 (Fix #[track_caller] and function pointers)
 - #68339 (Add `riscv64gc-unknown-linux-gnu` into target list in build-manifest)
 - #68381 (Added minor clarification to specification of GlobalAlloc::realloc.)
 - #68397 (rustdoc: Correct order of `async` and `unsafe` in `async unsafe fn`s)

Failed merges:

r? @ghost
@bors bors merged commit 2ccf65c into rust-lang:master Jan 21, 2020
allan2 added a commit to allan2/rustc-hash that referenced this pull request Nov 20, 2021
This change is to be consistent with rust-lang/rust.
Their change was made in January 2020. The PR over there: [Remove appendix from LICENCE-APACHE](rust-lang/rust#67734)
bors added a commit to rust-lang/libc that referenced this pull request Jan 31, 2022
bors added a commit to rust-lang/libc that referenced this pull request Jan 31, 2022
allan2 added a commit to allan2/rustc-hash that referenced this pull request Mar 1, 2024
This change is to be consistent with rust-lang/rust.
Their change was made in January 2020. The PR over there: [Remove appendix from LICENCE-APACHE](rust-lang/rust#67734)
bors added a commit to rust-lang/rust-analyzer that referenced this pull request Aug 27, 2024
internal: Drop Apache license appendices

Closes #14586

Similar to rust-lang/rust#67734
lnicola pushed a commit to lnicola/rust that referenced this pull request Aug 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants