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

Clarify licensing situation of MPSC and SPSC queue #104139

Merged
merged 1 commit into from
Nov 9, 2022

Conversation

pietroalbini
Copy link
Member

Originally, these two files were licensed under the BSD-2-Clause license, as they were based off sample code on a blog licensing those snippets under that license:

  • library/std/src/sync/mpsc/mpsc_queue.rs
  • library/std/src/sync/mpsc/spsc_queue.rs

In 2017 though, the author of that blog agreed to relicense their code under the standard MIT OR Apache-2.0 license in #42149. This PR clarifies the situation in the files by expanding the comment at the top of the file.

r? @pnkfelix

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Nov 8, 2022
@rustbot
Copy link
Collaborator

rustbot commented Nov 8, 2022

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@pnkfelix
Copy link
Member

pnkfelix commented Nov 8, 2022

ha ha, I was expecting a one-line addition (and just expecting a lot more inference to be performed from any future audience).

but this of course is good. :)

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 8, 2022

📌 Commit 807a7bf has been approved by pnkfelix

It is now in the queue for this repository.

@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 Nov 8, 2022
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Nov 8, 2022
…pnkfelix

Clarify licensing situation of MPSC and SPSC queue

Originally, these two files were licensed under the `BSD-2-Clause` license, as they were based off sample code on a blog licensing those snippets under that license:

* `library/std/src/sync/mpsc/mpsc_queue.rs`
* `library/std/src/sync/mpsc/spsc_queue.rs`

In 2017 though, the author of that blog agreed to relicense their code under the standard `MIT OR Apache-2.0` license in rust-lang#42149. This PR clarifies the situation in the files by expanding the comment at the top of the file.

r? `@pnkfelix`
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 8, 2022
…llaumeGomez

Rollup of 12 pull requests

Successful merges:

 - rust-lang#103928 (Add 'ty_error_with_guaranteed' and 'const_error_with_guaranteed')
 - rust-lang#104027 (Place config.toml in current working directory if config not found)
 - rust-lang#104093 (disable btree size tests on Miri)
 - rust-lang#104097 (run alloc benchmarks in Miri and fix UB)
 - rust-lang#104104 (Add split-debuginfo print option)
 - rust-lang#104109 (rustdoc: Add mutable to the description)
 - rust-lang#104113 (Fix `const_fn_trait_ref_impl`, add test for it)
 - rust-lang#104114 (Fix invalid background-image file name)
 - rust-lang#104132 (fix: lint against lint functions)
 - rust-lang#104139 (Clarify licensing situation of MPSC and SPSC queue)
 - rust-lang#104147 (Remove an address comparison from the parser)
 - rust-lang#104165 (Add llvm-main to triagebot.toml)

Failed merges:

 - rust-lang#104115 (Migrate crate-search element to CSS variables)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ed38562 into rust-lang:master Nov 9, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 9, 2022
@pietroalbini pietroalbini deleted the pa-channel-licensing branch November 9, 2022 13:45
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. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants