From 4b68923f75f18860ba512fc714e9aa61f2bc408b Mon Sep 17 00:00:00 2001 From: Dennis Schwerdel Date: Tue, 19 Jan 2016 21:52:44 +0100 Subject: [PATCH] Using copy trait more often --- src/ethernet.rs | 2 +- src/types.rs | 6 +++--- src/udpmessage.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ethernet.rs b/src/ethernet.rs index c256c36..831f215 100644 --- a/src/ethernet.rs +++ b/src/ethernet.rs @@ -75,7 +75,7 @@ impl Table for SwitchTable { #[inline] fn learn(&mut self, key: Address, _prefix_len: Option, addr: SocketAddr) { let value = SwitchTableValue{address: addr, timeout: now()+self.timeout as Time}; - if self.table.insert(key.clone(), value).is_none() { + if self.table.insert(key, value).is_none() { info!("Learned address {} => {}", key, addr); } } diff --git a/src/types.rs b/src/types.rs index 4d0c80b..b5b060a 100644 --- a/src/types.rs +++ b/src/types.rs @@ -11,7 +11,7 @@ pub type NetworkId = u64; pub type NodeId = [u8; NODE_ID_BYTES]; -#[derive(PartialOrd, Eq, Ord, Clone, Hash)] +#[derive(PartialOrd, Eq, Ord, Clone, Hash, Copy)] pub struct Address { pub data: [u8; 16], pub len: u8 @@ -128,7 +128,7 @@ impl FromStr for Address { } -#[derive(PartialEq, PartialOrd, Eq, Ord, Hash, Clone)] +#[derive(PartialEq, PartialOrd, Eq, Ord, Hash, Clone, Copy)] pub struct Range { pub base: Address, pub prefix_len: u8 @@ -196,7 +196,7 @@ impl fmt::Display for Type { } -#[derive(RustcDecodable, Debug)] +#[derive(RustcDecodable, Debug, Clone, Copy)] pub enum Mode { Normal, Hub, Switch, Router } diff --git a/src/udpmessage.rs b/src/udpmessage.rs index 96cc146..f01c021 100644 --- a/src/udpmessage.rs +++ b/src/udpmessage.rs @@ -10,7 +10,7 @@ pub const VERSION: u8 = 1; const NETWORK_ID_BYTES: usize = 8; -#[derive(Clone)] +#[derive(Clone, Copy)] #[repr(packed)] struct TopHeader { magic: [u8; 3],