From bb613fbd2a267a762f7de6269671fb0bfee74618 Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Thu, 19 Dec 2019 11:02:56 -0600 Subject: [PATCH] rust: remove unnecessary parentheses (Rust 1.40 fixup) Rust 1.40 in strict mode will now fail the build on the presence of unnecessary parentheses. warning: unnecessary parentheses around type --> src/smb/smb2_ioctl.rs:41:12 | 41 | -> (&mut SMBTransaction) | ^^^^^^^^^^^^^^^^^^^^^ help: remove these parentheses | = note: `#[warn(unused_parens)]` on by default (cherry picked from commit 5ee8323028aeb0d2c4926bae3bf8dafd05215d56) --- rust/src/smb/dcerpc.rs | 4 ++-- rust/src/smb/session.rs | 2 +- rust/src/smb/smb.rs | 12 ++++++------ rust/src/smb/smb2_ioctl.rs | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/rust/src/smb/dcerpc.rs b/rust/src/smb/dcerpc.rs index 109558b9ee..6d164a25ef 100644 --- a/rust/src/smb/dcerpc.rs +++ b/rust/src/smb/dcerpc.rs @@ -196,7 +196,7 @@ impl SMBTransactionDCERPC { impl SMBState { fn new_dcerpc_tx(&mut self, hdr: SMBCommonHdr, vercmd: SMBVerCmdStat, cmd: u8, call_id: u32) - -> (&mut SMBTransaction) + -> &mut SMBTransaction { let mut tx = self.new_tx(); tx.hdr = hdr; @@ -211,7 +211,7 @@ impl SMBState { } fn new_dcerpc_tx_for_response(&mut self, hdr: SMBCommonHdr, vercmd: SMBVerCmdStat, call_id: u32) - -> (&mut SMBTransaction) + -> &mut SMBTransaction { let mut tx = self.new_tx(); tx.hdr = hdr; diff --git a/rust/src/smb/session.rs b/rust/src/smb/session.rs index 9f35c6d7c7..1103dde03d 100644 --- a/rust/src/smb/session.rs +++ b/rust/src/smb/session.rs @@ -42,7 +42,7 @@ impl SMBTransactionSessionSetup { impl SMBState { pub fn new_sessionsetup_tx(&mut self, hdr: SMBCommonHdr) - -> (&mut SMBTransaction) + -> &mut SMBTransaction { let mut tx = self.new_tx(); diff --git a/rust/src/smb/smb.rs b/rust/src/smb/smb.rs index 5611dd4cf4..44bc40a8e3 100644 --- a/rust/src/smb/smb.rs +++ b/rust/src/smb/smb.rs @@ -393,7 +393,7 @@ impl SMBTransactionSetFilePathInfo { impl SMBState { pub fn new_setfileinfo_tx(&mut self, filename: Vec, fid: Vec, subcmd: u16, loi: u16, delete_on_close: bool) - -> (&mut SMBTransaction) + -> &mut SMBTransaction { let mut tx = self.new_tx(); @@ -411,7 +411,7 @@ impl SMBState { pub fn new_setpathinfo_tx(&mut self, filename: Vec, subcmd: u16, loi: u16, delete_on_close: bool) - -> (&mut SMBTransaction) + -> &mut SMBTransaction { let mut tx = self.new_tx(); @@ -446,7 +446,7 @@ impl SMBTransactionRename { impl SMBState { pub fn new_rename_tx(&mut self, fuid: Vec, oldname: Vec, newname: Vec) - -> (&mut SMBTransaction) + -> &mut SMBTransaction { let mut tx = self.new_tx(); @@ -933,7 +933,7 @@ impl SMBState { * track a single cmd request/reply pair. */ pub fn new_generic_tx(&mut self, smb_ver: u8, smb_cmd: u16, key: SMBCommonHdr) - -> (&mut SMBTransaction) + -> &mut SMBTransaction { let mut tx = self.new_tx(); if smb_ver == 1 && smb_cmd <= 255 { @@ -1007,7 +1007,7 @@ impl SMBState { } pub fn new_negotiate_tx(&mut self, smb_ver: u8) - -> (&mut SMBTransaction) + -> &mut SMBTransaction { let mut tx = self.new_tx(); if smb_ver == 1 { @@ -1049,7 +1049,7 @@ impl SMBState { } pub fn new_treeconnect_tx(&mut self, hdr: SMBCommonHdr, name: Vec) - -> (&mut SMBTransaction) + -> &mut SMBTransaction { let mut tx = self.new_tx(); diff --git a/rust/src/smb/smb2_ioctl.rs b/rust/src/smb/smb2_ioctl.rs index 43ce24270e..ffa434444a 100644 --- a/rust/src/smb/smb2_ioctl.rs +++ b/rust/src/smb/smb2_ioctl.rs @@ -39,7 +39,7 @@ impl SMBTransactionIoctl { impl SMBState { pub fn new_ioctl_tx(&mut self, hdr: SMBCommonHdr, func: u32) - -> (&mut SMBTransaction) + -> &mut SMBTransaction { let mut tx = self.new_tx(); tx.hdr = hdr; -- 2.47.2