Skip to content

Commit 91ba242

Browse files
bors[bot]taiki-e
andauthored
Merge #512
512: Separate licenses with `OR` instead of `/` r=jeehoonkang a=taiki-e `/` is deprecated. Refs: rust-lang/cargo#4898 Closes #419 Co-authored-by: Taiki Endo <[email protected]>
2 parents 3aa4c00 + d311c9c commit 91ba242

File tree

14 files changed

+21
-21
lines changed

14 files changed

+21
-21
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "crossbeam"
77
version = "0.7.3"
88
authors = ["The Crossbeam Project Developers"]
99
edition = "2018"
10-
license = "MIT/Apache-2.0"
10+
license = "MIT OR Apache-2.0"
1111
readme = "README.md"
1212
repository = "https://github.com/crossbeam-rs/crossbeam"
1313
homepage = "https://github.com/crossbeam-rs/crossbeam"

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
[![Build Status](https://github.com/crossbeam-rs/crossbeam/workflows/CI/badge.svg)](
44
https://github.com/crossbeam-rs/crossbeam/actions)
5-
[![License](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue.svg)](
6-
https://github.com/crossbeam-rs/crossbeam)
5+
[![License](https://img.shields.io/badge/license-MIT%20OR%20Apache--2.0-blue.svg)](
6+
https://github.com/crossbeam-rs/crossbeam#license)
77
[![Cargo](https://img.shields.io/crates/v/crossbeam.svg)](
88
https://crates.io/crates/crossbeam)
99
[![Documentation](https://docs.rs/crossbeam/badge.svg)](

crossbeam-channel/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "crossbeam-channel"
77
version = "0.4.2"
88
authors = ["The Crossbeam Project Developers"]
99
edition = "2018"
10-
license = "MIT/Apache-2.0 AND BSD-2-Clause"
10+
license = "(MIT OR Apache-2.0) AND BSD-2-Clause"
1111
readme = "README.md"
1212
repository = "https://github.com/crossbeam-rs/crossbeam"
1313
homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-channel"

crossbeam-channel/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
[![Build Status](https://github.com/crossbeam-rs/crossbeam/workflows/CI/badge.svg)](
44
https://github.com/crossbeam-rs/crossbeam/actions)
5-
[![License](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue.svg)](
6-
https://github.com/crossbeam-rs/crossbeam-channel)
5+
[![License](https://img.shields.io/badge/license-MIT%20OR%20Apache--2.0-blue.svg)](
6+
https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-channel#license)
77
[![Cargo](https://img.shields.io/crates/v/crossbeam-channel.svg)](
88
https://crates.io/crates/crossbeam-channel)
99
[![Documentation](https://docs.rs/crossbeam-channel/badge.svg)](

crossbeam-deque/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "crossbeam-deque"
77
version = "0.7.3"
88
authors = ["The Crossbeam Project Developers"]
99
edition = "2018"
10-
license = "MIT/Apache-2.0"
10+
license = "MIT OR Apache-2.0"
1111
readme = "README.md"
1212
repository = "https://github.com/crossbeam-rs/crossbeam"
1313
homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-deque"

crossbeam-deque/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
[![Build Status](https://github.com/crossbeam-rs/crossbeam/workflows/CI/badge.svg)](
44
https://github.com/crossbeam-rs/crossbeam/actions)
5-
[![License](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue.svg)](
6-
https://github.com/crossbeam-rs/crossbeam-deque)
5+
[![License](https://img.shields.io/badge/license-MIT%20OR%20Apache--2.0-blue.svg)](
6+
https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-deque#license)
77
[![Cargo](https://img.shields.io/crates/v/crossbeam-deque.svg)](
88
https://crates.io/crates/crossbeam-deque)
99
[![Documentation](https://docs.rs/crossbeam-deque/badge.svg)](

crossbeam-epoch/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "crossbeam-epoch"
77
version = "0.8.2"
88
authors = ["The Crossbeam Project Developers"]
99
edition = "2018"
10-
license = "MIT/Apache-2.0"
10+
license = "MIT OR Apache-2.0"
1111
readme = "README.md"
1212
repository = "https://github.com/crossbeam-rs/crossbeam"
1313
homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-epoch"

crossbeam-epoch/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
[![Build Status](https://github.com/crossbeam-rs/crossbeam/workflows/CI/badge.svg)](
44
https://github.com/crossbeam-rs/crossbeam/actions)
5-
[![License](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue.svg)](
6-
https://github.com/crossbeam-rs/crossbeam-epoch)
5+
[![License](https://img.shields.io/badge/license-MIT%20OR%20Apache--2.0-blue.svg)](
6+
https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-epoch#license)
77
[![Cargo](https://img.shields.io/crates/v/crossbeam-epoch.svg)](
88
https://crates.io/crates/crossbeam-epoch)
99
[![Documentation](https://docs.rs/crossbeam-epoch/badge.svg)](

crossbeam-queue/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "crossbeam-queue"
77
version = "0.2.2"
88
authors = ["The Crossbeam Project Developers"]
99
edition = "2018"
10-
license = "MIT/Apache-2.0 AND BSD-2-Clause"
10+
license = "(MIT OR Apache-2.0) AND BSD-2-Clause"
1111
readme = "README.md"
1212
repository = "https://github.com/crossbeam-rs/crossbeam"
1313
homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils"

crossbeam-queue/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
[![Build Status](https://github.com/crossbeam-rs/crossbeam/workflows/CI/badge.svg)](
44
https://github.com/crossbeam-rs/crossbeam/actions)
5-
[![License](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue.svg)](
6-
https://github.com/crossbeam-rs/crossbeam-queue/tree/master/src)
5+
[![License](https://img.shields.io/badge/license-MIT%20OR%20Apache--2.0-blue.svg)](
6+
https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-queue#license)
77
[![Cargo](https://img.shields.io/crates/v/crossbeam-queue.svg)](
88
https://crates.io/crates/crossbeam-queue)
99
[![Documentation](https://docs.rs/crossbeam-queue/badge.svg)](

crossbeam-skiplist/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "crossbeam-skiplist"
77
version = "0.0.0"
88
authors = ["The Crossbeam Project Developers"]
99
edition = "2018"
10-
license = "MIT/Apache-2.0"
10+
license = "MIT OR Apache-2.0"
1111
readme = "README.md"
1212
repository = "https://github.com/crossbeam-rs/crossbeam"
1313
homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-skiplist"

crossbeam-skiplist/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
[![Build Status](https://github.com/crossbeam-rs/crossbeam/workflows/CI/badge.svg)](
44
https://github.com/crossbeam-rs/crossbeam/actions)
5-
[![License](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue.svg)](
6-
https://github.com/crossbeam-rs/crossbeam-skiplist)
5+
[![License](https://img.shields.io/badge/license-MIT%20OR%20Apache--2.0-blue.svg)](
6+
https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-skiplist#license)
77
[![Cargo](https://img.shields.io/crates/v/crossbeam-skiplist.svg)](
88
https://crates.io/crates/crossbeam-skiplist)
99
[![Documentation](https://docs.rs/crossbeam-skiplist/badge.svg)](

crossbeam-utils/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "crossbeam-utils"
77
version = "0.7.2"
88
authors = ["The Crossbeam Project Developers"]
99
edition = "2018"
10-
license = "MIT/Apache-2.0"
10+
license = "MIT OR Apache-2.0"
1111
readme = "README.md"
1212
repository = "https://github.com/crossbeam-rs/crossbeam"
1313
homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils"

crossbeam-utils/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
[![Build Status](https://github.com/crossbeam-rs/crossbeam/workflows/CI/badge.svg)](
44
https://github.com/crossbeam-rs/crossbeam/actions)
5-
[![License](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue.svg)](
6-
https://github.com/crossbeam-rs/crossbeam-utils/tree/master/src)
5+
[![License](https://img.shields.io/badge/license-MIT%20OR%20Apache--2.0-blue.svg)](
6+
https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils#license)
77
[![Cargo](https://img.shields.io/crates/v/crossbeam-utils.svg)](
88
https://crates.io/crates/crossbeam-utils)
99
[![Documentation](https://docs.rs/crossbeam-utils/badge.svg)](

0 commit comments

Comments
 (0)