From 10b4c30a0651624e9ea73019c13e078ef9d467cd Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Tue, 14 Jul 2020 19:11:30 +0900 Subject: [PATCH] Use `OR` instead of deprecated `/` in license field (#155) --- actix-codec/Cargo.toml | 2 +- actix-connect/Cargo.toml | 2 +- actix-ioframe/Cargo.toml | 2 +- actix-macros/Cargo.toml | 2 +- actix-rt/Cargo.toml | 2 +- actix-server/Cargo.toml | 2 +- actix-service/Cargo.toml | 2 +- actix-testing/Cargo.toml | 2 +- actix-threadpool/Cargo.toml | 2 +- actix-tls/Cargo.toml | 2 +- actix-tracing/Cargo.toml | 2 +- actix-utils/Cargo.toml | 2 +- router/Cargo.toml | 2 +- string/Cargo.toml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/actix-codec/Cargo.toml b/actix-codec/Cargo.toml index 3c7a93bc..1d9a669b 100644 --- a/actix-codec/Cargo.toml +++ b/actix-codec/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://actix.rs" repository = "https://github.com/actix/actix-net.git" documentation = "https://docs.rs/actix-codec/" categories = ["network-programming", "asynchronous"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" workspace = ".." diff --git a/actix-connect/Cargo.toml b/actix-connect/Cargo.toml index bd72b22e..87fc2ece 100644 --- a/actix-connect/Cargo.toml +++ b/actix-connect/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://actix.rs" repository = "https://github.com/actix/actix-net.git" documentation = "https://docs.rs/actix-connect/" categories = ["network-programming", "asynchronous"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" [package.metadata.docs.rs] diff --git a/actix-ioframe/Cargo.toml b/actix-ioframe/Cargo.toml index efc81740..0cf431a6 100644 --- a/actix-ioframe/Cargo.toml +++ b/actix-ioframe/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://actix.rs" repository = "https://github.com/actix/actix-net.git" documentation = "https://docs.rs/actix-ioframe/" categories = ["network-programming", "asynchronous"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" [lib] diff --git a/actix-macros/Cargo.toml b/actix-macros/Cargo.toml index a8527673..3bef8ea2 100644 --- a/actix-macros/Cargo.toml +++ b/actix-macros/Cargo.toml @@ -6,7 +6,7 @@ description = "Actix runtime macros" repository = "https://github.com/actix/actix-net" documentation = "https://docs.rs/actix-macros/" categories = ["network-programming", "asynchronous"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" [lib] diff --git a/actix-rt/Cargo.toml b/actix-rt/Cargo.toml index 9b1cd53f..c0bc750b 100644 --- a/actix-rt/Cargo.toml +++ b/actix-rt/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://actix.rs" repository = "https://github.com/actix/actix-net.git" documentation = "https://docs.rs/actix-rt/" categories = ["network-programming", "asynchronous"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" [lib] diff --git a/actix-server/Cargo.toml b/actix-server/Cargo.toml index 7d584aba..1d9dca0b 100644 --- a/actix-server/Cargo.toml +++ b/actix-server/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://actix.rs" repository = "https://github.com/actix/actix-net.git" documentation = "https://docs.rs/actix-server/" categories = ["network-programming", "asynchronous"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" exclude = [".gitignore", ".cargo/config"] edition = "2018" workspace = ".." diff --git a/actix-service/Cargo.toml b/actix-service/Cargo.toml index cb2b2cdb..8ab0a05b 100644 --- a/actix-service/Cargo.toml +++ b/actix-service/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://actix.rs" repository = "https://github.com/actix/actix-net.git" documentation = "https://docs.rs/actix-service/" categories = ["network-programming", "asynchronous"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" [lib] diff --git a/actix-testing/Cargo.toml b/actix-testing/Cargo.toml index 8646440d..430a12b6 100644 --- a/actix-testing/Cargo.toml +++ b/actix-testing/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://actix.rs" repository = "https://github.com/actix/actix-net.git" documentation = "https://docs.rs/actix-testing/" categories = ["network-programming", "asynchronous"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" workspace = ".." readme = "README.md" diff --git a/actix-threadpool/Cargo.toml b/actix-threadpool/Cargo.toml index dda7bff6..5998bae7 100644 --- a/actix-threadpool/Cargo.toml +++ b/actix-threadpool/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://actix.rs" repository = "https://github.com/actix/actix-net.git" documentation = "https://docs.rs/actix-threadpool/" categories = ["network-programming", "asynchronous"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" exclude = [".gitignore", ".travis.yml", ".cargo/config", "appveyor.yml"] edition = "2018" workspace = ".." diff --git a/actix-tls/Cargo.toml b/actix-tls/Cargo.toml index 0d235e22..3573eebb 100644 --- a/actix-tls/Cargo.toml +++ b/actix-tls/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://actix.rs" repository = "https://github.com/actix/actix-net.git" documentation = "https://docs.rs/actix-tls/" categories = ["network-programming", "asynchronous"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" workspace = ".." diff --git a/actix-tracing/Cargo.toml b/actix-tracing/Cargo.toml index a8782361..d0b7bf29 100644 --- a/actix-tracing/Cargo.toml +++ b/actix-tracing/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://actix.rs" repository = "https://github.com/actix/actix-net.git" documentation = "https://docs.rs/actix-tracing/" categories = ["network-programming", "asynchronous"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" [lib] diff --git a/actix-utils/Cargo.toml b/actix-utils/Cargo.toml index f32ad5b5..f0a89165 100644 --- a/actix-utils/Cargo.toml +++ b/actix-utils/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://actix.rs" repository = "https://github.com/actix/actix-net.git" documentation = "https://docs.rs/actix-utils/" categories = ["network-programming", "asynchronous"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" [lib] diff --git a/router/Cargo.toml b/router/Cargo.toml index 1e5f4d54..db991e1a 100644 --- a/router/Cargo.toml +++ b/router/Cargo.toml @@ -7,7 +7,7 @@ keywords = ["actix"] homepage = "https://actix.rs" repository = "https://github.com/actix/actix-net.git" documentation = "https://docs.rs/actix-router/" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" [lib] diff --git a/string/Cargo.toml b/string/Cargo.toml index cafbaf80..3653fe58 100644 --- a/string/Cargo.toml +++ b/string/Cargo.toml @@ -7,7 +7,7 @@ keywords = ["actix"] homepage = "https://actix.rs" repository = "https://github.com/actix/actix-net.git" documentation = "https://docs.rs/bytestring/" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" [lib]