From 98220752777a902f6764d2dcb54c9c8948185688 Mon Sep 17 00:00:00 2001 From: Alex Touchet Date: Mon, 10 Oct 2022 15:48:05 -0700 Subject: [PATCH 1/2] Use SPDX license format --- components/hashglobe/Cargo.toml | 2 +- components/malloc_size_of/Cargo.toml | 2 +- components/servo_arc/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/hashglobe/Cargo.toml b/components/hashglobe/Cargo.toml index 72368b30868..b8571e68c69 100644 --- a/components/hashglobe/Cargo.toml +++ b/components/hashglobe/Cargo.toml @@ -2,7 +2,7 @@ name = "hashglobe" version = "0.1.0" authors = ["The Rust Project Developers", "Manish Goregaokar "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "Fork of std::HashMap with stable fallible allocation." documentation = "https://docs.rs/hashglobe" repository = "https://github.com/Manishearth/hashglobe" diff --git a/components/malloc_size_of/Cargo.toml b/components/malloc_size_of/Cargo.toml index ea19a6f2cfc..d1968a188b6 100644 --- a/components/malloc_size_of/Cargo.toml +++ b/components/malloc_size_of/Cargo.toml @@ -2,7 +2,7 @@ name = "malloc_size_of" version = "0.0.1" authors = ["The Servo Project Developers"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" publish = false [lib] diff --git a/components/servo_arc/Cargo.toml b/components/servo_arc/Cargo.toml index f72654230f9..a2cb0750f1a 100644 --- a/components/servo_arc/Cargo.toml +++ b/components/servo_arc/Cargo.toml @@ -2,7 +2,7 @@ name = "servo_arc" version = "0.1.1" authors = ["The Servo Project Developers"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" repository = "https://github.com/servo/servo" description = "A fork of std::sync::Arc with some extra functionality and without weak references" From 65a4d1646da46c37fe748add6dcf24b62ebb602a Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Sun, 16 Oct 2022 09:23:05 -0400 Subject: [PATCH 2/2] Update allowed license string. --- python/tidy/servo_tidy/licenseck.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python/tidy/servo_tidy/licenseck.py b/python/tidy/servo_tidy/licenseck.py index 8c505366d65..deeaeb55333 100644 --- a/python/tidy/servo_tidy/licenseck.py +++ b/python/tidy/servo_tidy/licenseck.py @@ -36,6 +36,7 @@ COPYRIGHT = [ licenses_toml = [ 'license = "MPL-2.0"', 'license = "MIT/Apache-2.0"', + 'license = "MIT OR Apache-2.0"', ] # The valid dependency licenses, in the form we'd expect to see them in a Cargo.toml file.