chore: migrate to rust 2021 (#618)

Implies MSRV 1.56.x
paritytech · Dec 22, 2021 · 1e77c2d · 1e77c2d
1 parent 8462905
commit 1e77c2d
Show file tree

Hide file tree

Showing 18 changed files with 16 additions and 20 deletions.
diff --git a/benches/Cargo.toml b/benches/Cargo.toml
@@ -3,7 +3,7 @@ name = "jsonrpsee-benchmarks"
 version = "0.6.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Benchmarks for jsonrpsee"
-edition = "2018"
+edition = "2021"
 license = "MIT"
 publish = false
 

diff --git a/client/http-client/Cargo.toml b/client/http-client/Cargo.toml
@@ -3,7 +3,7 @@ name = "jsonrpsee-http-client"
 version = "0.6.1"
 authors = ["Parity Technologies <admin@parity.io>", "Pierre Krieger <pierre.krieger1708@gmail.com>"]
 description = "HTTP client for JSON-RPC"
-edition = "2018"
+edition = "2021"
 license = "MIT"
 repository = "https://github.com/paritytech/jsonrpsee"
 homepage = "https://github.com/paritytech/jsonrpsee"

diff --git a/client/transport/Cargo.toml b/client/transport/Cargo.toml
@@ -3,7 +3,7 @@ name = "jsonrpsee-client-transport"
 version = "0.6.1"
 authors = ["Parity Technologies <admin@parity.io>", "Pierre Krieger <pierre.krieger1708@gmail.com>"]
 description = "WebSocket client for JSON-RPC"
-edition = "2018"
+edition = "2021"
 license = "MIT"
 repository = "https://github.com/paritytech/jsonrpsee"
 homepage = "https://github.com/paritytech/jsonrpsee"

diff --git a/client/transport/src/ws/mod.rs b/client/transport/src/ws/mod.rs
@@ -26,7 +26,6 @@
 
 mod stream;
 
-use std::convert::{TryFrom, TryInto};
 use std::io;
 use std::net::{SocketAddr, ToSocketAddrs};
 use std::time::Duration;
@@ -505,7 +504,6 @@ fn build_tls_config(cert_store: &CertificateStore) -> Result<tokio_rustls::TlsCo
 mod tests {
 	use super::{Mode, Target, Uri, WsHandshakeError};
 	use http::uri::InvalidUri;
-	use std::convert::TryInto;
 
 	fn assert_ws_target(target: Target, host: &str, host_header: &str, mode: Mode, path_and_query: &str) {
 		assert_eq!(&target.host, host);

diff --git a/client/ws-client/Cargo.toml b/client/ws-client/Cargo.toml
@@ -3,7 +3,7 @@ name = "jsonrpsee-ws-client"
 version = "0.6.1"
 authors = ["Parity Technologies <admin@parity.io>", "Pierre Krieger <pierre.krieger1708@gmail.com>"]
 description = "WebSocket client for JSON-RPC"
-edition = "2018"
+edition = "2021"
 license = "MIT"
 repository = "https://github.com/paritytech/jsonrpsee"
 homepage = "https://github.com/paritytech/jsonrpsee"

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -3,7 +3,7 @@ name = "jsonrpsee-core"
 version = "0.6.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Utilities for jsonrpsee"
-edition = "2018"
+edition = "2021"
 license = "MIT"
 
 [dependencies]

diff --git a/core/src/client/async_client/helpers.rs b/core/src/client/async_client/helpers.rs
@@ -24,7 +24,6 @@
 // IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use std::convert::TryInto;
 use std::time::Duration;
 
 use crate::client::async_client::manager::{RequestManager, RequestStatus};

diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -3,7 +3,7 @@ name = "jsonrpsee-examples"
 version = "0.6.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Examples for jsonrpsee"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dev-dependencies]

diff --git a/http-server/Cargo.toml b/http-server/Cargo.toml
@@ -3,7 +3,7 @@ name = "jsonrpsee-http-server"
 version = "0.6.1"
 authors = ["Parity Technologies <admin@parity.io>", "Pierre Krieger <pierre.krieger1708@gmail.com>"]
 description = "HTTP server for JSON-RPC"
-edition = "2018"
+edition = "2021"
 license = "MIT"
 repository = "https://github.com/paritytech/jsonrpsee"
 homepage = "https://github.com/paritytech/jsonrpsee"

diff --git a/jsonrpsee/Cargo.toml b/jsonrpsee/Cargo.toml
@@ -4,7 +4,7 @@ description = "JSON-RPC crate"
 version = "0.6.1"
 authors = ["Parity Technologies <admin@parity.io>", "Pierre Krieger <pierre.krieger1708@gmail.com>"]
 license = "MIT"
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/paritytech/jsonrpsee"
 homepage = "https://github.com/paritytech/jsonrpsee"
 documentation = "https://docs.rs/jsonrpsee"

diff --git a/proc-macros/Cargo.toml b/proc-macros/Cargo.toml
@@ -4,7 +4,7 @@ description = "Procedueral macros for jsonrpsee"
 version = "0.6.1"
 authors = ["Parity Technologies <admin@parity.io>", "Pierre Krieger <pierre.krieger1708@gmail.com>"]
 license = "MIT"
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/paritytech/jsonrpsee"
 homepage = "https://github.com/paritytech/jsonrpsee"
 documentation = "https://docs.rs/jsonrpsee-proc-macros"

diff --git a/rustfmt.toml b/rustfmt.toml
@@ -1,4 +1,4 @@
 hard_tabs = true
 max_width = 120
 use_small_heuristics = "Max"
-edition = "2018"
+edition = "2021"
diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml
@@ -3,7 +3,7 @@ name = "jsonrpsee-test-utils"
 version = "0.6.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -3,7 +3,7 @@ name = "jsonrpsee-integration-tests"
 version = "0.6.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Integration tests for jsonrpsee"
-edition = "2018"
+edition = "2021"
 license = "MIT"
 publish = false
 

diff --git a/types/Cargo.toml b/types/Cargo.toml
@@ -3,7 +3,7 @@ name = "jsonrpsee-types"
 version = "0.6.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Shared types for jsonrpsee"
-edition = "2018"
+edition = "2021"
 license = "MIT"
 repository = "https://github.com/paritytech/jsonrpsee"
 homepage = "https://github.com/paritytech/jsonrpsee"

diff --git a/types/src/params.rs b/types/src/params.rs
@@ -27,7 +27,6 @@
 //! Types to handle JSON-RPC request parameters according to the [spec](https://www.jsonrpc.org/specification#parameter_structures).
 //! Some types come with a "*Ser" variant that implements [`serde::Serialize`]; these are used in the client.
 
-use std::convert::TryFrom;
 use std::fmt;
 
 use crate::error::CallError;

diff --git a/ws-server/Cargo.toml b/ws-server/Cargo.toml
@@ -3,7 +3,7 @@ name = "jsonrpsee-ws-server"
 version = "0.6.1"
 authors = ["Parity Technologies <admin@parity.io>", "Pierre Krieger <pierre.krieger1708@gmail.com>"]
 description = "WebSocket server for JSON-RPC"
-edition = "2018"
+edition = "2021"
 license = "MIT"
 repository = "https://github.com/paritytech/jsonrpsee"
 homepage = "https://github.com/paritytech/jsonrpsee"

diff --git a/ws-server/src/tests.rs b/ws-server/src/tests.rs
@@ -123,7 +123,7 @@ async fn server_with_handles() -> (SocketAddr, ServerHandle) {
 	module
 		.register_subscription("subscribe_hello", "subscribe_hello", "unsubscribe_hello", |_, sink, _| {
 			std::thread::spawn(move || loop {
-				let _ = sink;
+				let _ = &sink;
 				std::thread::sleep(std::time::Duration::from_secs(30));
 			});
 			Ok(())
@@ -653,7 +653,7 @@ async fn custom_subscription_id_works() {
 	module
 		.register_subscription("subscribe_hello", "subscribe_hello", "unsubscribe_hello", |_, sink, _| {
 			std::thread::spawn(move || loop {
-				let _ = sink;
+				let _ = &sink;
 				std::thread::sleep(std::time::Duration::from_secs(30));
 			});
 			Ok(())