Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #29010 - atouchet:lic, r=jdm

Browse source 
Use SPDX license format

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because ___

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
This commit is contained in:
bors-servo 2022-10-16 13:18:24 -04:00 • committed by GitHub
commit a8deb4d971
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/hashglobe/Cargo.toml
View file

@ -2,7 +2,7 @@
name = "hashglobe" name = "hashglobe"
version = "0.1.0" version = "0.1.0"
authors = ["The Rust Project Developers", "Manish Goregaokar <manishsmail@gmail.com>"] authors = ["The Rust Project Developers", "Manish Goregaokar <manishsmail@gmail.com>"]
license = "MIT/Apache-2.0" license = "MIT OR Apache-2.0"
description = "Fork of std::HashMap with stable fallible allocation." description = "Fork of std::HashMap with stable fallible allocation."
documentation = "https://docs.rs/hashglobe" documentation = "https://docs.rs/hashglobe"
repository = "https://github.com/Manishearth/hashglobe" repository = "https://github.com/Manishearth/hashglobe"

2
components/malloc_size_of/Cargo.toml
View file

@ -2,7 +2,7 @@
name = "malloc_size_of" name = "malloc_size_of"
version = "0.0.1" version = "0.0.1"
authors = ["The Servo Project Developers"] authors = ["The Servo Project Developers"]
license = "MIT/Apache-2.0" license = "MIT OR Apache-2.0"
publish = false publish = false
[lib] [lib]

2
components/servo_arc/Cargo.toml
View file

@ -2,7 +2,7 @@
name = "servo_arc" name = "servo_arc"
version = "0.1.1" version = "0.1.1"
authors = ["The Servo Project Developers"] authors = ["The Servo Project Developers"]
license = "MIT/Apache-2.0" license = "MIT OR Apache-2.0"
repository = "https://github.com/servo/servo" repository = "https://github.com/servo/servo"
description = "A fork of std::sync::Arc with some extra functionality and without weak references" description = "A fork of std::sync::Arc with some extra functionality and without weak references"

1
python/tidy/servo_tidy/licenseck.py
View file

@ -36,6 +36,7 @@ COPYRIGHT = [
licenses_toml = [ licenses_toml = [
'license = "MPL-2.0"', 'license = "MPL-2.0"',
'license = "MIT/Apache-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. # The valid dependency licenses, in the form we'd expect to see them in a Cargo.toml file.