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.

Sign up for GitHub

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

Switch to SPDX 2.1 license expression #60685

Merged
merged 1 commit into from
May 17, 2019
Merged

Switch to SPDX 2.1 license expression #60685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libstd/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ authors = ["The Rust Project Developers"]
name = "std"
version = "0.0.0"
build = "build.rs"
license = "MIT/Apache-2.0"
license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-lang/rust.git"
description = "The Rust Standard Library"
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/rustbook/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
authors = ["The Rust Project Developers"]
name = "rustbook"
version = "0.1.0"
license = "MIT/Apache-2.0"
license = "MIT OR Apache-2.0"
edition = "2018"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion src/tools/rustc-std-workspace-alloc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "rustc-std-workspace-alloc"
version = "1.0.0"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
license = 'MIT/Apache-2.0'
license = 'MIT OR Apache-2.0'
description = """
Hack for the compiler's own build system
"""
Expand Down
2 changes: 1 addition & 1 deletion src/tools/rustc-std-workspace-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "rustc-std-workspace-core"
version = "1.0.0"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
license = 'MIT/Apache-2.0'
license = 'MIT OR Apache-2.0'
description = """
Hack for the compiler's own build system
"""
Expand Down
2 changes: 1 addition & 1 deletion src/tools/rustc-workspace-hack/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "rustc-workspace-hack"
version = "1.0.0"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
license = 'MIT/Apache-2.0'
license = 'MIT OR Apache-2.0'
description = """
Hack for the compiler's own build system
"""
Expand Down
2 changes: 1 addition & 1 deletion src/tools/unstable-book-gen/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ authors = ["est31 <MTest31@outlook.com>",
"The Rust Project Developers"]
name = "unstable-book-gen"
version = "0.1.0"
license = "MIT/Apache-2.0"
license = "MIT OR Apache-2.0"
edition = "2018"

[dependencies]
Expand Down