From 54ad1e7e7022ca392249033cfd84b8ce7cde5b88 Mon Sep 17 00:00:00 2001 From: David Pedersen Date: Thu, 25 Nov 2021 12:22:52 +0100 Subject: [PATCH] chore: revert to 2018 edition Fixes https://github.com/hyperium/tonic/issues/843 --- examples/Cargo.toml | 2 +- interop/Cargo.toml | 2 +- rustfmt.toml | 2 +- tests/ambiguous_methods/Cargo.toml | 2 +- tests/compression/Cargo.toml | 2 +- tests/extern_path/my_application/Cargo.toml | 2 +- tests/extern_path/uuid/Cargo.toml | 2 +- tests/included_service/Cargo.toml | 2 +- tests/integration_tests/Cargo.toml | 2 +- tests/root-crate-path/Cargo.toml | 2 +- tests/same_name/Cargo.toml | 2 +- tests/service_named_service/Cargo.toml | 2 +- tests/stream_conflict/Cargo.toml | 2 +- tests/wellknown-compiled/Cargo.toml | 2 +- tests/wellknown/Cargo.toml | 2 +- tonic-build/Cargo.toml | 2 +- tonic-health/Cargo.toml | 2 +- tonic-reflection/Cargo.toml | 2 +- tonic-types/Cargo.toml | 2 +- tonic-web/Cargo.toml | 2 +- tonic-web/tests/integration/Cargo.toml | 2 +- tonic/Cargo.toml | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 077bae44f..17ec72f43 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Lucio Franco "] -edition = "2021" +edition = "2018" license = "MIT" name = "examples" publish = false diff --git a/interop/Cargo.toml b/interop/Cargo.toml index 856378fa4..ecb312fe1 100644 --- a/interop/Cargo.toml +++ b/interop/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Lucio Franco "] -edition = "2021" +edition = "2018" license = "MIT" name = "interop" publish = false diff --git a/rustfmt.toml b/rustfmt.toml index 3a26366d4..32a9786fa 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1 +1 @@ -edition = "2021" +edition = "2018" diff --git a/tests/ambiguous_methods/Cargo.toml b/tests/ambiguous_methods/Cargo.toml index 263db18ab..b009546ee 100644 --- a/tests/ambiguous_methods/Cargo.toml +++ b/tests/ambiguous_methods/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Yonathan Randolph "] -edition = "2021" +edition = "2018" license = "MIT" name = "ambiguous_methods" publish = false diff --git a/tests/compression/Cargo.toml b/tests/compression/Cargo.toml index bff48e2e6..e9717950c 100644 --- a/tests/compression/Cargo.toml +++ b/tests/compression/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Lucio Franco "] -edition = "2021" +edition = "2018" license = "MIT" name = "compression" publish = false diff --git a/tests/extern_path/my_application/Cargo.toml b/tests/extern_path/my_application/Cargo.toml index 359d1f939..e16c0f29b 100644 --- a/tests/extern_path/my_application/Cargo.toml +++ b/tests/extern_path/my_application/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Danny Hua "] -edition = "2021" +edition = "2018" license = "MIT" name = "my_application" publish = false diff --git a/tests/extern_path/uuid/Cargo.toml b/tests/extern_path/uuid/Cargo.toml index 089f48788..450aa74f1 100644 --- a/tests/extern_path/uuid/Cargo.toml +++ b/tests/extern_path/uuid/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Danny Hua "] -edition = "2021" +edition = "2018" license = "MIT" name = "uuid1" publish = false diff --git a/tests/included_service/Cargo.toml b/tests/included_service/Cargo.toml index 935d39d6f..6b4ce199b 100644 --- a/tests/included_service/Cargo.toml +++ b/tests/included_service/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Lucio Franco "] -edition = "2021" +edition = "2018" license = "MIT" name = "included_service" publish = false diff --git a/tests/integration_tests/Cargo.toml b/tests/integration_tests/Cargo.toml index 478fc04e7..96863abba 100644 --- a/tests/integration_tests/Cargo.toml +++ b/tests/integration_tests/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Lucio Franco "] -edition = "2021" +edition = "2018" license = "MIT" name = "integration-tests" publish = false diff --git a/tests/root-crate-path/Cargo.toml b/tests/root-crate-path/Cargo.toml index ae95e71f7..852169b23 100644 --- a/tests/root-crate-path/Cargo.toml +++ b/tests/root-crate-path/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Lucio Franco "] -edition = "2021" +edition = "2018" license = "MIT" name = "root-crate-path" publish = false diff --git a/tests/same_name/Cargo.toml b/tests/same_name/Cargo.toml index 7bb2a2aea..56408420b 100644 --- a/tests/same_name/Cargo.toml +++ b/tests/same_name/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Lucio Franco "] -edition = "2021" +edition = "2018" license = "MIT" name = "same_name" publish = false diff --git a/tests/service_named_service/Cargo.toml b/tests/service_named_service/Cargo.toml index fdc574429..3eb617844 100644 --- a/tests/service_named_service/Cargo.toml +++ b/tests/service_named_service/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Lucio Franco "] -edition = "2021" +edition = "2018" license = "MIT" name = "service_named_service" publish = false diff --git a/tests/stream_conflict/Cargo.toml b/tests/stream_conflict/Cargo.toml index 9b8f8d027..9826e2166 100644 --- a/tests/stream_conflict/Cargo.toml +++ b/tests/stream_conflict/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Ben Sully "] -edition = "2021" +edition = "2018" name = "stream_conflict" publish = false version = "0.1.0" diff --git a/tests/wellknown-compiled/Cargo.toml b/tests/wellknown-compiled/Cargo.toml index 1d442e627..c2894b61e 100644 --- a/tests/wellknown-compiled/Cargo.toml +++ b/tests/wellknown-compiled/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Lucio Franco "] -edition = "2021" +edition = "2018" license = "MIT" name = "wellknown-compiled" publish = false diff --git a/tests/wellknown/Cargo.toml b/tests/wellknown/Cargo.toml index b380f43f9..9fc39f5d4 100644 --- a/tests/wellknown/Cargo.toml +++ b/tests/wellknown/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Lucio Franco "] -edition = "2021" +edition = "2018" license = "MIT" name = "wellknown" publish = false diff --git a/tonic-build/Cargo.toml b/tonic-build/Cargo.toml index 4a699e595..0a031c284 100644 --- a/tonic-build/Cargo.toml +++ b/tonic-build/Cargo.toml @@ -5,7 +5,7 @@ description = """ Codegen module of `tonic` gRPC implementation. """ documentation = "https://docs.rs/tonic-build/0.6.0/tonic_build/" -edition = "2021" +edition = "2018" homepage = "https://github.com/hyperium/tonic" keywords = ["rpc", "grpc", "async", "codegen", "protobuf"] license = "MIT" diff --git a/tonic-health/Cargo.toml b/tonic-health/Cargo.toml index 7daeebe80..ace438e70 100644 --- a/tonic-health/Cargo.toml +++ b/tonic-health/Cargo.toml @@ -5,7 +5,7 @@ description = """ Health Checking module of `tonic` gRPC implementation. """ documentation = "https://docs.rs/tonic-health/0.4.0/tonic-health/" -edition = "2021" +edition = "2018" homepage = "https://github.com/hyperium/tonic" keywords = ["rpc", "grpc", "async", "healthcheck"] license = "MIT" diff --git a/tonic-reflection/Cargo.toml b/tonic-reflection/Cargo.toml index 2bf4837ea..885381852 100644 --- a/tonic-reflection/Cargo.toml +++ b/tonic-reflection/Cargo.toml @@ -7,7 +7,7 @@ categories = ["network-programming", "asynchronous"] description = """ Server Reflection module of `tonic` gRPC implementation. """ -edition = "2021" +edition = "2018" homepage = "https://github.com/hyperium/tonic" keywords = ["rpc", "grpc", "async", "reflection"] license = "MIT" diff --git a/tonic-types/Cargo.toml b/tonic-types/Cargo.toml index 4223a9b24..d902f6944 100644 --- a/tonic-types/Cargo.toml +++ b/tonic-types/Cargo.toml @@ -5,7 +5,7 @@ description = """ A collection of useful protobuf types that can be used with `tonic`. """ documentation = "https://docs.rs/tonic-types/0.4.0/tonic-types/" -edition = "2021" +edition = "2018" homepage = "https://github.com/hyperium/tonic" keywords = ["rpc", "grpc", "protobuf"] license = "MIT" diff --git a/tonic-web/Cargo.toml b/tonic-web/Cargo.toml index 6f57371ff..35acf4e06 100644 --- a/tonic-web/Cargo.toml +++ b/tonic-web/Cargo.toml @@ -5,7 +5,7 @@ description = """ grpc-web protocol translation for tonic services. """ documentation = "https://docs.rs/tonic-web/0.2.0/tonic-web/" -edition = "2021" +edition = "2018" homepage = "https://github.com/hyperium/tonic" keywords = ["rpc", "grpc", "grpc-web"] license = "MIT" diff --git a/tonic-web/tests/integration/Cargo.toml b/tonic-web/tests/integration/Cargo.toml index 63e5b97a3..cdc28163a 100644 --- a/tonic-web/tests/integration/Cargo.toml +++ b/tonic-web/tests/integration/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Juan Alvarez "] -edition = "2021" +edition = "2018" name = "integration" publish = false version = "0.1.0" diff --git a/tonic/Cargo.toml b/tonic/Cargo.toml index 132abd3b0..957342666 100644 --- a/tonic/Cargo.toml +++ b/tonic/Cargo.toml @@ -14,7 +14,7 @@ description = """ A gRPC over HTTP/2 implementation focused on high performance, interoperability, and flexibility. """ documentation = "https://docs.rs/tonic/0.6.1/tonic/" -edition = "2021" +edition = "2018" homepage = "https://github.com/hyperium/tonic" keywords = ["rpc", "grpc", "async", "futures", "protobuf"] license = "MIT"