mirror of
https://github.com/achanda/ipnetwork.git
synced 2025-06-17 09:18:51 +00:00
Make structs Copy,Hash,Eq,PartialEq
This commit is contained in:
26
src/lib.rs
26
src/lib.rs
@ -12,19 +12,19 @@ const IPV4_BITS: u8 = 32;
|
|||||||
const IPV6_BITS: u8 = 128;
|
const IPV6_BITS: u8 = 128;
|
||||||
|
|
||||||
// A network
|
// A network
|
||||||
#[derive(Debug,Clone)]
|
#[derive(Debug,Clone,Copy,Hash,PartialEq,Eq)]
|
||||||
pub enum IpNetwork {
|
pub enum IpNetwork {
|
||||||
V4(Ipv4Network),
|
V4(Ipv4Network),
|
||||||
V6(Ipv6Network),
|
V6(Ipv6Network),
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone,Copy,Hash,PartialEq,Eq)]
|
||||||
pub struct Ipv4Network {
|
pub struct Ipv4Network {
|
||||||
addr: Ipv4Addr,
|
addr: Ipv4Addr,
|
||||||
prefix: u8,
|
prefix: u8,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone,Copy,Hash,PartialEq,Eq)]
|
||||||
pub struct Ipv6Network {
|
pub struct Ipv6Network {
|
||||||
addr: Ipv6Addr,
|
addr: Ipv6Addr,
|
||||||
prefix: u8,
|
prefix: u8,
|
||||||
@ -239,6 +239,8 @@ fn parse_prefix(prefix: &str, max: u8) -> Result<u8, IpNetworkError> {
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod test {
|
mod test {
|
||||||
|
use std::mem;
|
||||||
|
use std::collections::HashMap;
|
||||||
use std::net::{Ipv4Addr, Ipv6Addr};
|
use std::net::{Ipv4Addr, Ipv6Addr};
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
@ -345,6 +347,24 @@ mod test {
|
|||||||
assert!(net.nth(1).is_none());
|
assert!(net.nth(1).is_none());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn hash_eq_compatibility_v4() {
|
||||||
|
let mut map = HashMap::new();
|
||||||
|
let net = Ipv4Network::new(Ipv4Addr::new(127, 0, 0, 1), 16).unwrap();
|
||||||
|
map.insert(net, 137);
|
||||||
|
let out = map.get(&net).unwrap();
|
||||||
|
assert_eq!(137, *out);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn copy_compatibility_v4() {
|
||||||
|
let net = Ipv4Network::new(Ipv4Addr::new(127, 0, 0, 1), 16).unwrap();
|
||||||
|
mem::drop(net);
|
||||||
|
assert_eq!(16, net.prefix());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn create_v6() {
|
fn create_v6() {
|
||||||
let cidr = Ipv6Network::new(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1), 24).unwrap();
|
let cidr = Ipv6Network::new(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1), 24).unwrap();
|
||||||
|
Reference in New Issue
Block a user