diff options
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> | 2023-08-24 17:36:50 +0200 |
|---|---|---|
| committer | Joe Birr-Pixton <jpixton@gmail.com> | 2024-04-19 14:43:16 +0000 |
| commit | 3587d98f4ea434495facc0688b8b07313cb02e4a (patch) | |
| tree | 210cf20d5298b935c340e106a9cb0c47768b6273 | |
| parent | d082e837b34c0605b1851e45c421c91c1d15391c (diff) | |
Apply clippy suggestions from Rust 1.72
| -rw-r--r-- | rustls/src/msgs/message_test.rs | 6 | ||||
| -rw-r--r-- | rustls/src/server/tls13.rs | 2 | ||||
| -rw-r--r-- | rustls/tests/api.rs | 4 | ||||
| -rw-r--r-- | rustls/tests/key_log_file_env.rs | 2 |
4 files changed, 5 insertions, 9 deletions
diff --git a/rustls/src/msgs/message_test.rs b/rustls/src/msgs/message_test.rs index 010f93cd..5ba8f120 100644 --- a/rustls/src/msgs/message_test.rs +++ b/rustls/src/msgs/message_test.rs @@ -82,12 +82,6 @@ fn alert_is_not_handshake() { } #[test] -fn alert_is_not_opaque() { - let m = Message::build_alert(AlertLevel::Fatal, AlertDescription::DecodeError); - assert!(Message::try_from(m).is_ok()); -} - -#[test] fn construct_all_types() { let samples = [ &b"\x14\x03\x04\x00\x01\x01"[..], diff --git a/rustls/src/server/tls13.rs b/rustls/src/server/tls13.rs index 1684a55a..ba340ccd 100644 --- a/rustls/src/server/tls13.rs +++ b/rustls/src/server/tls13.rs @@ -605,7 +605,7 @@ mod client_hello { common.send_msg(m, false); } - #[allow(clippy::needless_pass_by_ref_mut)] // cx only mutated if cfg(feature = "quic") + #[cfg_attr(not(feature = "quic"), allow(clippy::needless_pass_by_ref_mut))] fn decide_if_early_data_allowed( cx: &mut ServerContext<'_>, client_hello: &ClientHelloPayload, diff --git a/rustls/tests/api.rs b/rustls/tests/api.rs index 77faeacd..50f06e86 100644 --- a/rustls/tests/api.rs +++ b/rustls/tests/api.rs @@ -1141,6 +1141,7 @@ fn client_flush_does_nothing() { assert!(matches!(client.writer().flush(), Ok(()))); } +#[allow(clippy::no_effect)] #[test] fn server_is_send_and_sync() { let (_, server) = make_pair(KeyType::Rsa); @@ -1148,6 +1149,7 @@ fn server_is_send_and_sync() { &server as &dyn Sync; } +#[allow(clippy::no_effect)] #[test] fn client_is_send_and_sync() { let (client, _) = make_pair(KeyType::Rsa); @@ -4210,7 +4212,7 @@ fn test_client_mtu_reduction() { fn flush(&mut self) -> io::Result<()> { panic!() } - fn write_vectored<'b>(&mut self, b: &[io::IoSlice<'b>]) -> io::Result<usize> { + fn write_vectored(&mut self, b: &[io::IoSlice<'_>]) -> io::Result<usize> { let writes = b .iter() .map(|slice| slice.len()) diff --git a/rustls/tests/key_log_file_env.rs b/rustls/tests/key_log_file_env.rs index bc15f533..9503d0ea 100644 --- a/rustls/tests/key_log_file_env.rs +++ b/rustls/tests/key_log_file_env.rs @@ -49,7 +49,7 @@ fn serialized(f: impl FnOnce()) { }); let mutex = unsafe { MUTEX.as_mut() }; - let _guard = mutex.unwrap().lock().unwrap(); + let _guard = mutex.unwrap().get_mut().unwrap(); // XXX: NOT thread safe. env::set_var("SSLKEYLOGFILE", "./sslkeylogfile.txt"); |