-
Notifications
You must be signed in to change notification settings - Fork 12.8k
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
Conversation
Hey! It looks like you've submitted a new PR for the library teams! If this PR contains changes to any Examples of
|
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 |
…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`
…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
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