Remove superfluous .to_vec()'s, and replace some with vec![]

1 files changed, 74 insertions, 114 deletions

diff --git a/talpid-wireguard/src/wireguard_kernel/wg_message.rs b/talpid-wireguard/src/wireguard_kernel/wg_message.rs
index 9c299b4a04..6d97547e00 100644
--- a/talpid-wireguard/src/wireguard_kernel/wg_message.rs
+++ b/talpid-wireguard/src/wireguard_kernel/wg_message.rs
@@ -707,73 +707,54 @@ mod test {
 
         let if_name = CString::new(b"wg-test".to_vec()).unwrap();
 
-        let peer_1 = PeerMessage(
-            [
-                PeerNla::PublicKey([
-                    32, 224, 68, 5, 23, 136, 103, 229, 206, 59, 34, 231, 215, 139, 214, 236, 80,
-                    81, 187, 7, 154, 197, 251, 36, 171, 156, 48, 73, 145, 47, 134, 54,
-                ]),
-                PeerNla::PresharedKey([
-                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0, 0,
-                ]),
-                LastHandshakeTime(TimeSpec::seconds(0)),
-                PersistentKeepaliveInterval(0),
-                TxBytes(0),
-                RxBytes(0),
-                ProtocolVersion(1),
-                Endpoint(InetAddr::from_std(&"192.168.40.1:9797".parse().unwrap())),
-                AllowedIps(
-                    [AllowedIpMessage(
-                        [
-                            CidrMask(32),
-                            AddressFamily(2),
-                            IpAddr(Ipv4Addr::new(192, 168, 39, 1).into()),
-                        ]
-                        .to_vec(),
-                    )]
-                    .to_vec()
-                    .to_vec(),
-                ),
-            ]
-            .to_vec(),
-        );
+        let peer_1 = PeerMessage(vec![
+            PeerNla::PublicKey([
+                32, 224, 68, 5, 23, 136, 103, 229, 206, 59, 34, 231, 215, 139, 214, 236, 80, 81,
+                187, 7, 154, 197, 251, 36, 171, 156, 48, 73, 145, 47, 134, 54,
+            ]),
+            PeerNla::PresharedKey([
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ]),
+            LastHandshakeTime(TimeSpec::seconds(0)),
+            PersistentKeepaliveInterval(0),
+            TxBytes(0),
+            RxBytes(0),
+            ProtocolVersion(1),
+            Endpoint(InetAddr::from_std(&"192.168.40.1:9797".parse().unwrap())),
+            AllowedIps(vec![AllowedIpMessage(vec![
+                CidrMask(32),
+                AddressFamily(2),
+                IpAddr(Ipv4Addr::new(192, 168, 39, 1).into()),
+            ])]),
+        ]);
 
-        let peer_2 = PeerMessage(
-            [
-                PeerNla::PublicKey([
-                    244, 28, 206, 12, 79, 36, 88, 183, 194, 157, 54, 38, 54, 183, 127, 32, 142, 24,
-                    251, 158, 217, 56, 12, 146, 208, 21, 132, 157, 162, 68, 2, 44,
-                ]),
-                PresharedKey([
-                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0, 0,
-                ]),
-                LastHandshakeTime(TimeSpec::seconds(0)),
-                PersistentKeepaliveInterval(0),
-                TxBytes(0),
-                RxBytes(0),
-                ProtocolVersion(1),
-                Endpoint(InetAddr::from_std(&"192.168.40.2:9797".parse().unwrap())),
-                AllowedIps(
-                    [AllowedIpMessage(
-                        [
-                            CidrMask(32),
-                            AddressFamily(2),
-                            IpAddr(Ipv4Addr::new(192, 168, 39, 2).into()),
-                        ]
-                        .to_vec(),
-                    )]
-                    .to_vec(),
-                ),
-            ]
-            .to_vec(),
-        );
+        let peer_2 = PeerMessage(vec![
+            PeerNla::PublicKey([
+                244, 28, 206, 12, 79, 36, 88, 183, 194, 157, 54, 38, 54, 183, 127, 32, 142, 24,
+                251, 158, 217, 56, 12, 146, 208, 21, 132, 157, 162, 68, 2, 44,
+            ]),
+            PresharedKey([
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ]),
+            LastHandshakeTime(TimeSpec::seconds(0)),
+            PersistentKeepaliveInterval(0),
+            TxBytes(0),
+            RxBytes(0),
+            ProtocolVersion(1),
+            Endpoint(InetAddr::from_std(&"192.168.40.2:9797".parse().unwrap())),
+            AllowedIps(vec![AllowedIpMessage(vec![
+                CidrMask(32),
+                AddressFamily(2),
+                IpAddr(Ipv4Addr::new(192, 168, 39, 2).into()),
+            ])]),
+        ]);
 
         DeviceMessage {
             command: WG_CMD_GET_DEVICE,
             message_type: 0,
-            nlas: [
+            nlas: vec![
                 ListenPort(51820),
                 Fwmark(0),
                 IfIndex(320),
@@ -786,9 +767,8 @@ mod test {
                     102, 218, 178, 222, 191, 21, 59, 83, 124, 180, 124, 41, 91, 10, 134, 199, 84,
                     186, 27, 218, 53, 216, 20, 93, 203, 82, 68, 74, 189, 142, 99, 59,
                 ]),
-                Peers([peer_1, peer_2].to_vec()),
-            ]
-            .to_vec(),
+                Peers(vec![peer_1, peer_2]),
+            ],
         }
     }
 
@@ -799,66 +779,46 @@ mod test {
 
         let if_name = CString::new("wg-test".to_string()).unwrap();
 
-        let peer_1 = PeerMessage(
-            [
-                PeerNla::PublicKey([
-                    32, 224, 68, 5, 23, 136, 103, 229, 206, 59, 34, 231, 215, 139, 214, 236, 80,
-                    81, 187, 7, 154, 197, 251, 36, 171, 156, 48, 73, 145, 47, 134, 54,
-                ]),
-                Endpoint(InetAddr::from_std(&"192.168.40.1:9797".parse().unwrap())),
-                PeerNla::Flags(WGPEER_F_REPLACE_ALLOWEDIPS),
-                AllowedIps(
-                    [AllowedIpMessage(
-                        [
-                            AddressFamily(2),
-                            IpAddr(Ipv4Addr::new(192, 168, 39, 1).into()),
-                            CidrMask(32),
-                        ]
-                        .to_vec(),
-                    )]
-                    .to_vec()
-                    .to_vec(),
-                ),
-            ]
-            .to_vec(),
-        );
+        let peer_1 = PeerMessage(vec![
+            PeerNla::PublicKey([
+                32, 224, 68, 5, 23, 136, 103, 229, 206, 59, 34, 231, 215, 139, 214, 236, 80, 81,
+                187, 7, 154, 197, 251, 36, 171, 156, 48, 73, 145, 47, 134, 54,
+            ]),
+            Endpoint(InetAddr::from_std(&"192.168.40.1:9797".parse().unwrap())),
+            PeerNla::Flags(WGPEER_F_REPLACE_ALLOWEDIPS),
+            AllowedIps(vec![AllowedIpMessage(vec![
+                AddressFamily(2),
+                IpAddr(Ipv4Addr::new(192, 168, 39, 1).into()),
+                CidrMask(32),
+            ])]),
+        ]);
 
-        let peer_2 = PeerMessage(
-            [
-                PeerNla::PublicKey([
-                    244, 28, 206, 12, 79, 36, 88, 183, 194, 157, 54, 38, 54, 183, 127, 32, 142, 24,
-                    251, 158, 217, 56, 12, 146, 208, 21, 132, 157, 162, 68, 2, 44,
-                ]),
-                Endpoint(InetAddr::from_std(&"192.168.40.2:9797".parse().unwrap())),
-                PeerNla::Flags(WGPEER_F_REPLACE_ALLOWEDIPS),
-                AllowedIps(
-                    [AllowedIpMessage(
-                        [
-                            AddressFamily(2),
-                            IpAddr(Ipv4Addr::new(192, 168, 39, 2).into()),
-                            CidrMask(32),
-                        ]
-                        .to_vec(),
-                    )]
-                    .to_vec(),
-                ),
-            ]
-            .to_vec(),
-        );
+        let peer_2 = PeerMessage(vec![
+            PeerNla::PublicKey([
+                244, 28, 206, 12, 79, 36, 88, 183, 194, 157, 54, 38, 54, 183, 127, 32, 142, 24,
+                251, 158, 217, 56, 12, 146, 208, 21, 132, 157, 162, 68, 2, 44,
+            ]),
+            Endpoint(InetAddr::from_std(&"192.168.40.2:9797".parse().unwrap())),
+            PeerNla::Flags(WGPEER_F_REPLACE_ALLOWEDIPS),
+            AllowedIps(vec![AllowedIpMessage(vec![
+                AddressFamily(2),
+                IpAddr(Ipv4Addr::new(192, 168, 39, 2).into()),
+                CidrMask(32),
+            ])]),
+        ]);
 
         DeviceMessage {
             command: WG_CMD_SET_DEVICE,
             message_type: 0,
-            nlas: [
+            nlas: vec![
                 IfName(if_name),
                 PrivateKey([
                     56, 71, 244, 173, 101, 223, 85, 22, 171, 175, 15, 39, 53, 180, 193, 198, 73,
                     55, 53, 59, 188, 26, 52, 74, 173, 179, 22, 213, 161, 71, 252, 125,
                 ]),
                 ListenPort(51820),
-                Peers([peer_1, peer_2].to_vec()),
-            ]
-            .to_vec(),
+                Peers(vec![peer_1, peer_2]),
+            ],
         }
     }