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

libstd/sync/mpsc: relicense under rust license #42149

Merged
merged 1 commit into from
May 25, 2017
Merged

Conversation

dvyukov
Copy link
Contributor

@dvyukov dvyukov commented May 22, 2017

These files are licensed under a different license
than the rest of the codebase. This causes potential
issues and inconveniences.
Relicense these files under the standard license.
I hold original copyright on that code.

Fixes #36556

These files are licensed under a different license
than the rest of the codebase. This causes potential
issues and inconveniences.
Relicense these files under the standard license.
I hold original copyright on that code.

Fixes rust-lang#36556
@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@alexcrichton
Copy link
Member

Whoa awesome thanks so much @dvyukov! I'm personally not much of a licensing expert myself so I think I'll defer to others like @brson, but I'll be sure that we get a resolution on this soon regardless.

@steveklabnik
Copy link
Member

Looks great to me; thanks so much for doing this and making things a bit easier ❤️

@carols10cents
Copy link
Member

r? @brson

@rust-highfive rust-highfive assigned brson and unassigned alexcrichton May 22, 2017
@carols10cents carols10cents added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 22, 2017
@brson
Copy link
Contributor

brson commented May 22, 2017

I think we can do this without much fuss. The vast majority of the code was written by @alexcrichton based off @dvyukov, and these are all the people who have touched these files:

Aaron Turon
Alex Crichton
Andre Bogus
Ariel Ben-Yehuda
Barosl Lee
Brian Anderson
Felix S. Klock II
Huon Wilson
Jeffrey Seyfried
Johannes Oertel
Jorge Aparicio
Manish Goregaokar
Michael Layzell
Nick Cameron
Niko Matsakis
Stepan Koltsov
Steven Fackler
Tamir Duberstein
Tobias Bucher
Vadim Petrochenkov

Almost all these people we know are cool with the Rust license, and their contributions are likely trivial.

So I think we should just do it.

@brson
Copy link
Contributor

brson commented May 22, 2017

@bors r+ let's see if anybody stops me...

@bors
Copy link
Contributor

bors commented May 22, 2017

📌 Commit 0b85b64 has been approved by brson

@brson
Copy link
Contributor

brson commented May 22, 2017

@bors r-

Oh actually this code was not written by @alexcrichton but by @toffaletti in #9710. That gives me pause.

@brson
Copy link
Contributor

brson commented May 22, 2017

@toffaletti I wonder if you are around to take a look at this. It is re licensing the queue you wrote for Rust way back in 2013 from BSD to the Rust MIT/Apache-2.0 license.

@toffaletti
Copy link
Contributor

@brson I agree to relicensing. Thanks @dvyukov

@alexcrichton
Copy link
Member

Awesome, thanks @toffaletti!

@bors: r=brson

@bors
Copy link
Contributor

bors commented May 23, 2017

📌 Commit 0b85b64 has been approved by brson

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 23, 2017
libstd/sync/mpsc: relicense under rust license

These files are licensed under a different license
than the rest of the codebase. This causes potential
issues and inconveniences.
Relicense these files under the standard license.
I hold original copyright on that code.

Fixes rust-lang#36556
@arielb1 arielb1 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 May 23, 2017
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 24, 2017
libstd/sync/mpsc: relicense under rust license

These files are licensed under a different license
than the rest of the codebase. This causes potential
issues and inconveniences.
Relicense these files under the standard license.
I hold original copyright on that code.

Fixes rust-lang#36556
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 24, 2017
libstd/sync/mpsc: relicense under rust license

These files are licensed under a different license
than the rest of the codebase. This causes potential
issues and inconveniences.
Relicense these files under the standard license.
I hold original copyright on that code.

Fixes rust-lang#36556
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 24, 2017
libstd/sync/mpsc: relicense under rust license

These files are licensed under a different license
than the rest of the codebase. This causes potential
issues and inconveniences.
Relicense these files under the standard license.
I hold original copyright on that code.

Fixes rust-lang#36556
bors added a commit that referenced this pull request May 24, 2017
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 25, 2017
libstd/sync/mpsc: relicense under rust license

These files are licensed under a different license
than the rest of the codebase. This causes potential
issues and inconveniences.
Relicense these files under the standard license.
I hold original copyright on that code.

Fixes rust-lang#36556
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 25, 2017
libstd/sync/mpsc: relicense under rust license

These files are licensed under a different license
than the rest of the codebase. This causes potential
issues and inconveniences.
Relicense these files under the standard license.
I hold original copyright on that code.

Fixes rust-lang#36556
bors added a commit that referenced this pull request May 25, 2017
@bors bors merged commit 0b85b64 into rust-lang:master May 25, 2017
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`
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``
thomcc pushed a commit to tcdi/postgrestd that referenced this pull request Feb 10, 2023
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/rust#42149. This PR clarifies the situation in the files by expanding the comment at the top of the file.

r? ``@pnkfelix``
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.

9 participants