Skip to content

Commit

Permalink
Merge #607
Browse files Browse the repository at this point in the history
607: Update third party licenses r=taiki-e a=taiki-e

See #536 for details.

Co-authored-by: Taiki Endo <te316e89@gmail.com>
  • Loading branch information
bors[bot] and taiki-e authored Nov 29, 2020
2 parents 6a6d2a5 + 33e4c64 commit 47110fd
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 89 deletions.
32 changes: 0 additions & 32 deletions crossbeam-channel/LICENSE-THIRD-PARTY
Original file line number Diff line number Diff line change
@@ -1,37 +1,5 @@
===============================================================================

Bounded MPMC queue
http://www.1024cores.net/home/code-license

Copyright (c) 2010-2011 Dmitry Vyukov.
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY DMITRY VYUKOV "AS IS" AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
EVENT SHALL DMITRY VYUKOV OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

The views and conclusions contained in the software and documentation are those
of the authors and should not be interpreted as representing official policies,
either expressed or implied, of Dmitry Vyukov.

===============================================================================

matching.go
https://creativecommons.org/licenses/by/3.0/legalcode

Expand Down
4 changes: 0 additions & 4 deletions crossbeam-channel/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,6 @@ This product includes copies and modifications of software developed by third pa
[matching.go](http://www.nada.kth.se/~snilsson/concurrency/src/matching.go) by Stefan Nilsson,
licensed under Creative Commons Attribution 3.0 Unported License.

* [src/flavors/array.rs](src/flavors/array.rs) is based on
[Bounded MPMC queue](http://www.1024cores.net/home/lock-free-algorithms/queues/bounded-mpmc-queue)
by Dmitry Vyukov, licensed under the Simplified BSD License and the Apache License, Version 2.0.

* [tests/mpsc.rs](tests/mpsc.rs) includes modifications of code from The Rust Programming Language,
licensed under the MIT License and the Apache License, Version 2.0.

Expand Down
5 changes: 0 additions & 5 deletions crossbeam-channel/src/flavors/array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@
//! Source:
//! - <http://www.1024cores.net/home/lock-free-algorithms/queues/bounded-mpmc-queue>
//! - <https://docs.google.com/document/d/1yIAYmbvL3JxOKOjuCyon7JhW4cSv1wy5hC0ApeGMV9s/pub>
//!
//! Copyright & License:
//! - Copyright (c) 2010-2011 Dmitry Vyukov
//! - Simplified BSD License and Apache License, Version 2.0
//! - <http://www.1024cores.net/home/code-license>
use std::cell::UnsafeCell;
use std::marker::PhantomData;
Expand Down
31 changes: 0 additions & 31 deletions crossbeam-queue/LICENSE-THIRD-PARTY

This file was deleted.

12 changes: 0 additions & 12 deletions crossbeam-queue/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,3 @@ at your option.
Unless you explicitly state otherwise, any contribution intentionally submitted
for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
dual licensed as above, without any additional terms or conditions.

#### Third party software

This product includes copies and modifications of software developed by third parties:

* [src/array_queue.rs](src/array_queue.rs) is based on
[Bounded MPMC queue](http://www.1024cores.net/home/lock-free-algorithms/queues/bounded-mpmc-queue)
by Dmitry Vyukov, licensed under the Simplified BSD License and the Apache License, Version 2.0.

See the source code files for more details.

Copies of third party licenses can be found in [LICENSE-THIRD-PARTY](LICENSE-THIRD-PARTY).
5 changes: 0 additions & 5 deletions crossbeam-queue/src/array_queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
//!
//! Source:
//! - <http://www.1024cores.net/home/lock-free-algorithms/queues/bounded-mpmc-queue>
//!
//! Copyright & License:
//! - Copyright (c) 2010-2011 Dmitry Vyukov
//! - Simplified BSD License and Apache License, Version 2.0
//! - <http://www.1024cores.net/home/code-license>
use alloc::boxed::Box;
use core::cell::UnsafeCell;
Expand Down

0 comments on commit 47110fd

Please sign in to comment.