Clarify licensing situation of MPSC and SPSC queue#104139
Merged
bors merged 1 commit intorust-lang:masterfrom Nov 9, 2022
Merged
Clarify licensing situation of MPSC and SPSC queue#104139bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
rustbot
added
S-waiting-on-review
Collaborator
|
Hey! It looks like you've submitted a new PR for the library teams! If this PR contains changes to any Examples of
|
Contributor
|
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 |
Collaborator
bors
added
S-waiting-on-bors
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`
11 tasks
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
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Originally, these two files were licensed under the
BSD-2-Clauselicense, as they were based off sample code on a blog licensing those snippets under that license:library/std/src/sync/mpsc/mpsc_queue.rslibrary/std/src/sync/mpsc/spsc_queue.rsIn 2017 though, the author of that blog agreed to relicense their code under the standard
MIT OR Apache-2.0license in #42149. This PR clarifies the situation in the files by expanding the comment at the top of the file.r? @pnkfelix