Skip to content

Commit 78beafb

Browse files
committed
Auto merge of #757 - atouchet:lic, r=nikomatsakis
Use SPDX license format
2 parents 9592a2c + 67954f3 commit 78beafb

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "chalk"
33
version = "0.81.0-dev.0"
44
description = "Model of the Rust trait system"
5-
license = "Apache-2.0/MIT"
5+
license = "MIT OR Apache-2.0"
66
authors = ["Rust Compiler Team", "Chalk developers"]
77
repository = "https://github.com/rust-lang/chalk"
88
readme = "README.md"

chalk-derive/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "chalk-derive"
33
version = "0.81.0-dev.0"
44
description = "A helper crate for use by chalk crates for `derive` macros."
5-
license = "Apache-2.0/MIT"
5+
license = "MIT OR Apache-2.0"
66
authors = ["Rust Compiler Team", "Chalk developers"]
77
repository = "https://github.com/rust-lang/chalk"
88
readme = "README.md"

chalk-engine/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "chalk-engine"
33
version = "0.81.0-dev.0"
44
description = "Core trait engine from Chalk project"
5-
license = "Apache-2.0/MIT"
5+
license = "MIT OR Apache-2.0"
66
authors = ["Rust Compiler Team", "Chalk developers"]
77
repository = "https://github.com/rust-lang/chalk"
88
readme = "README.md"

chalk-integration/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "chalk-integration"
33
version = "0.81.0-dev.0"
4-
license = "Apache-2.0/MIT"
4+
license = "MIT OR Apache-2.0"
55
description = "Sample solver setup for Chalk"
66
authors = ["Rust Compiler Team", "Chalk developers"]
77
repository = "https://github.com/rust-lang/chalk"

chalk-ir/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "chalk-ir"
33
version = "0.81.0-dev.0"
44
description = "Chalk's internal representation of types, goals, and clauses"
5-
license = "Apache-2.0/MIT"
5+
license = "MIT OR Apache-2.0"
66
authors = ["Rust Compiler Team", "Chalk developers"]
77
repository = "https://github.com/rust-lang/chalk"
88
readme = "README.md"

chalk-parse/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "chalk-parse"
33
version = "0.81.0-dev.0"
44
description = "Parser for the Chalk project"
5-
license = "Apache-2.0/MIT"
5+
license = "MIT OR Apache-2.0"
66
authors = ["Rust Compiler Team", "Chalk developers"]
77
repository = "https://github.com/rust-lang/chalk"
88
readme = "README.md"

chalk-recursive/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "chalk-recursive"
33
version = "0.81.0-dev.0"
44
description = "Recursive solver for the Chalk project"
5-
license = "Apache-2.0/MIT"
5+
license = "MIT OR Apache-2.0"
66
authors = ["Rust Compiler Team", "Chalk developers"]
77
repository = "https://github.com/rust-lang/chalk"
88
readme = "README.md"

chalk-solve/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "chalk-solve"
33
version = "0.81.0-dev.0"
44
description = "Combines the chalk-engine with chalk-ir"
5-
license = "Apache-2.0/MIT"
5+
license = "MIT OR Apache-2.0"
66
authors = ["Rust Compiler Team", "Chalk developers"]
77
repository = "https://github.com/rust-lang/chalk"
88
readme = "README.md"

0 commit comments

Comments
 (0)