chore: Upgrade to 2021 edition (#808)

examples/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
-name = "examples"
-version = "0.1.0"
 authors = ["Lucio Franco <luciofranco14@gmail.com>"]
-edition = "2018"
-publish = false
+edition = "2021"
 license = "MIT"
+name = "examples"
+publish = false
+version = "0.1.0"
 
 [[bin]]
 name = "helloworld-server"
@@ -179,38 +179,38 @@ name = "streaming-server"
 path = "src/streaming/server.rs"
 
 [dependencies]
-tonic = { path = "../tonic", features = ["tls", "compression"] }
-prost = "0.9"
-tokio = { version = "1.0", features = ["rt-multi-thread", "time", "fs", "macros", "net"] }
-tokio-stream = { version =  "0.1", features = ["net"] }
 async-stream = "0.3"
-futures = { version = "0.3", default-features = false, features = ["alloc"] }
-tower = { version = "0.4" }
+futures = {version = "0.3", default-features = false, features = ["alloc"]}
+prost = "0.9"
+tokio = {version = "1.0", features = ["rt-multi-thread", "time", "fs", "macros", "net"]}
+tokio-stream = {version = "0.1", features = ["net"]}
+tonic = {path = "../tonic", features = ["tls", "compression"]}
+tower = {version = "0.4"}
 # Required for routeguide
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
 rand = "0.8"
+serde = {version = "1.0", features = ["derive"]}
+serde_json = "1.0"
 # Tracing
 tracing = "0.1.16"
-tracing-subscriber = { version = "0.2", features = ["tracing-log"] }
 tracing-attributes = "0.1"
 tracing-futures = "0.2"
+tracing-subscriber = {version = "0.2", features = ["tracing-log"]}
 # Required for wellknown types
 prost-types = "0.9"
 # Hyper example
-hyper = { version = "0.14", features = ["full"] }
-warp = "0.3"
 http = "0.2"
 http-body = "0.4.2"
+hyper = {version = "0.14", features = ["full"]}
 pin-project = "1.0"
+warp = "0.3"
 # Health example
-tonic-health = { path = "../tonic-health" }
+tonic-health = {path = "../tonic-health"}
 # Reflection example
-tonic-reflection = { path = "../tonic-reflection" }
 listenfd = "0.3"
+tonic-reflection = {path = "../tonic-reflection"}
 # grpc-web example
-tonic-web = { path = "../tonic-web" }
 bytes = "1"
+tonic-web = {path = "../tonic-web"}
 
 [build-dependencies]
-tonic-build = { path = "../tonic-build", features = ["prost", "compression"] }
+tonic-build = {path = "../tonic-build", features = ["prost", "compression"]}

examples/helloworld-tutorial.md

@@ -102,7 +102,7 @@ Now that have defined the protobuf for our application we can start writing our
 [package]
 name = "helloworld-tonic"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [[bin]] # Bin to run the HelloWorld gRPC server
 name = "helloworld-server"

interop/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
-name = "interop"
-version = "0.1.0"
 authors = ["Lucio Franco <luciofranco14@gmail.com>"]
-edition = "2018"
-publish = false
+edition = "2021"
 license = "MIT"
+name = "interop"
+publish = false
+version = "0.1.0"
 
 [[bin]]
 name = "client"
@@ -15,24 +15,24 @@ name = "server"
 path = "src/bin/server.rs"
 
 [dependencies]
-tokio = { version = "1.0", features = ["rt-multi-thread", "time", "macros", "fs"] }
-tokio-stream = "0.1"
 async-stream = "0.3"
-tonic = { path = "../tonic", features = ["tls"] }
-prost = "0.9"
-prost-derive = "0.9"
 bytes = "1.0"
-http = "0.2"
+console = "0.14"
 futures-core = "0.3"
 futures-util = "0.3"
-tower = { version = "0.4" }
+http = "0.2"
 http-body = "0.4.2"
 hyper = "0.14"
-console = "0.14"
+prost = "0.9"
+prost-derive = "0.9"
 structopt = "0.3"
+tokio = {version = "1.0", features = ["rt-multi-thread", "time", "macros", "fs"]}
+tokio-stream = "0.1"
+tonic = {path = "../tonic", features = ["tls"]}
+tower = {version = "0.4"}
 tracing = "0.1"
-tracing-subscriber = "0.2"
 tracing-log = "0.1"
+tracing-subscriber = "0.2"
 
 [build-dependencies]
-tonic-build = { path = "../tonic-build", features = ["prost"] }
+tonic-build = {path = "../tonic-build", features = ["prost"]}

rustfmt.toml

@@ -1 +1 @@
-edition = "2018"
+edition = "2021"

tests/ambiguous_methods/Cargo.toml

@@ -1,16 +1,16 @@
 [package]
-name = "ambiguous_methods"
-version = "0.1.0"
 authors = ["Yonathan Randolph <yonathan@gmail.com>"]
-edition = "2018"
-publish = false
+edition = "2021"
 license = "MIT"
+name = "ambiguous_methods"
+publish = false
+version = "0.1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tonic = { path= "../../tonic" }
 prost = "0.9"
+tonic = {path = "../../tonic"}
 
 [build-dependencies]
-tonic-build = { path= "../../tonic-build" }
+tonic-build = {path = "../../tonic-build"}

tests/compression/Cargo.toml

@@ -1,24 +1,24 @@
 [package]
-name = "compression"
-version = "0.1.0"
 authors = ["Lucio Franco <luciofranco14@gmail.com>"]
-edition = "2018"
-publish = false
+edition = "2021"
 license = "MIT"
+name = "compression"
+publish = false
+version = "0.1.0"
 
 [dependencies]
-tonic = { path = "../../tonic", features = ["compression"] }
-prost = "0.9"
-tokio = { version = "1.0", features = ["macros", "rt-multi-thread", "net"] }
-tower = { version = "0.4", features = [] }
-http-body = "0.4"
-http = "0.2"
-tokio-stream = { version = "0.1.5", features = ["net"] }
-tower-http = { version = "0.1", features = ["map-response-body", "map-request-body"] }
 bytes = "1"
 futures = "0.3"
-pin-project = "1.0"
+http = "0.2"
+http-body = "0.4"
 hyper = "0.14.3"
+pin-project = "1.0"
+prost = "0.9"
+tokio = {version = "1.0", features = ["macros", "rt-multi-thread", "net"]}
+tokio-stream = {version = "0.1.5", features = ["net"]}
+tonic = {path = "../../tonic", features = ["compression"]}
+tower = {version = "0.4", features = []}
+tower-http = {version = "0.1", features = ["map-response-body", "map-request-body"]}
 
 [build-dependencies]
-tonic-build = { path = "../../tonic-build", features = ["compression"] }
+tonic-build = {path = "../../tonic-build", features = ["compression"]}

tests/extern_path/my_application/Cargo.toml

@@ -1,18 +1,18 @@
 [package]
-name = "my_application"
-version = "0.1.0"
 authors = ["Danny Hua <danny@42layers.io>"]
-edition = "2018"
-publish = false
+edition = "2021"
 license = "MIT"
+name = "my_application"
+publish = false
+version = "0.1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tonic = { path= "../../../tonic" }
 prost = "0.9"
 prost-types = "0.9"
-uuid = { package = "uuid1", path= "../uuid" }
+tonic = {path = "../../../tonic"}
+uuid = {package = "uuid1", path = "../uuid"}
 
 [build-dependencies]
-tonic-build = { path= "../../../tonic-build" }
+tonic-build = {path = "../../../tonic-build"}

tests/extern_path/uuid/Cargo.toml

@@ -1,15 +1,15 @@
 [package]
-name = "uuid1"
-version = "0.1.0"
 authors = ["Danny Hua <danny@42layers.io>"]
-edition = "2018"
-publish = false
+edition = "2021"
 license = "MIT"
+name = "uuid1"
+publish = false
+version = "0.1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-prost = "0.9"
 bytes = "1.0"
+prost = "0.9"
 [build-dependencies]
 prost-build = "0.9"

tests/included_service/Cargo.toml

@@ -1,16 +1,16 @@
 [package]
-name = "included_service"
-version = "0.1.0"
 authors = ["Lucio Franco <luciofranco14@gmail.com>"]
-edition = "2018"
-publish = false
+edition = "2021"
 license = "MIT"
+name = "included_service"
+publish = false
+version = "0.1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tonic = { path = "../../tonic" }
 prost = "0.9"
+tonic = {path = "../../tonic"}
 
 [build-dependencies]
-tonic-build = { path = "../../tonic-build" }
+tonic-build = {path = "../../tonic-build"}

tests/integration_tests/Cargo.toml

@@ -1,29 +1,29 @@
 [package]
-name = "integration-tests"
-version = "0.1.0"
 authors = ["Lucio Franco <luciofranco14@gmail.com>"]
-edition = "2018"
-publish = false
+edition = "2021"
 license = "MIT"
+name = "integration-tests"
+publish = false
+version = "0.1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tonic = { path = "../../tonic" }
-prost = "0.9"
-futures-util = "0.3"
 bytes = "1.0"
+futures-util = "0.3"
+prost = "0.9"
+tonic = {path = "../../tonic"}
 
 [dev-dependencies]
-tokio = { version = "1.0", features = ["macros", "rt-multi-thread", "net"] }
-tokio-stream = { version = "0.1.5", features = ["net"] }
-tower-service = "0.3"
-hyper = "0.14"
 futures = "0.3"
-tower = { version = "0.4", features = [] }
-http-body = "0.4"
 http = "0.2"
+http-body = "0.4"
+hyper = "0.14"
+tokio = {version = "1.0", features = ["macros", "rt-multi-thread", "net"]}
+tokio-stream = {version = "0.1.5", features = ["net"]}
+tower = {version = "0.4", features = []}
+tower-service = "0.3"
 tracing-subscriber = "0.2"
 
 [build-dependencies]
-tonic-build = { path = "../../tonic-build" }
+tonic-build = {path = "../../tonic-build"}

tests/root-crate-path/Cargo.toml

@@ -1,14 +1,14 @@
 [package]
-name = "root-crate-path"
-version = "0.1.0"
 authors = ["Lucio Franco <luciofranco14@gmail.com>"]
-edition = "2018"
-publish = false
+edition = "2021"
 license = "MIT"
+name = "root-crate-path"
+publish = false
+version = "0.1.0"
 
 [dependencies]
-tonic = { path = "../../tonic" }
 prost = "0.9"
+tonic = {path = "../../tonic"}
 
 [build_dependencies]
-tonic-build = { path = "../../tonic-build" }
+tonic-build = {path = "../../tonic-build"}

tests/same_name/Cargo.toml

@@ -1,16 +1,16 @@
 [package]
-name = "same_name"
-version = "0.1.0"
 authors = ["Lucio Franco <luciofranco14@gmail.com>"]
-edition = "2018"
-publish = false
+edition = "2021"
 license = "MIT"
+name = "same_name"
+publish = false
+version = "0.1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tonic = { path = "../../tonic" }
 prost = "0.9"
+tonic = {path = "../../tonic"}
 
 [build-dependencies]
-tonic-build = { path = "../../tonic-build" }
+tonic-build = {path = "../../tonic-build"}

tests/service_named_service/Cargo.toml

@@ -1,16 +1,16 @@
 [package]
-name = "service_named_service"
-version = "0.1.0"
 authors = ["Lucio Franco <luciofranco14@gmail.com>"]
-edition = "2018"
-publish = false
+edition = "2021"
 license = "MIT"
+name = "service_named_service"
+publish = false
+version = "0.1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tonic = { path = "../../tonic" }
 prost = "0.9"
+tonic = {path = "../../tonic"}
 
 [build-dependencies]
-tonic-build = { path = "../../tonic-build" }
+tonic-build = {path = "../../tonic-build"}

tests/stream_conflict/Cargo.toml

@@ -1,15 +1,15 @@
 [package]
-name = "stream_conflict"
-version = "0.1.0"
 authors = ["Ben Sully <ben@bsull.io>"]
+edition = "2021"
+name = "stream_conflict"
 publish = false
-edition = "2018"
+version = "0.1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tonic = { path = "../../tonic" }
 prost = "0.9"
+tonic = {path = "../../tonic"}
 
 [build-dependencies]
-tonic-build = { path = "../../tonic-build" }
+tonic-build = {path = "../../tonic-build"}