src/main.rs

@@ -1,23 +1,5 @@
-use std::{io, str::FromStr};
-
 mod networking;
-use networking::ip::{IpAddr};
 
 fn main() {
-    println!("Enter the IP and CIDR for your given network");
+    println!("Hello, World!")
-    
-    loop {
-        let mut ip = String::new();
-        io::stdin().read_line(&mut ip).unwrap();
-        let ip_address = match IpAddr::from_str(x) {
-            Err(_) => {
-                println!("fucked it");
-                IpAddr::V4(0, 0, 0, 0)
-            },
-            Ok(ip) => ip,
-        };
-
-        println!("you entered, {:?}", ip_address);
-    }
-    
 }

src/networking/ip.rs

@@ -1,8 +1,5 @@
 use std::str::FromStr;
 
-#[derive(Debug, PartialEq, Eq)]
-pub struct InvalidIPErr;
-
 /// Ip address enum that includes associated type
 /// 
 /// # Example
@@ -18,6 +15,9 @@ pub enum IpAddr {
     V6(String)
 }
 
+#[derive(Debug)]
+pub struct InvalidIPErr;
+
 impl ToString for IpAddr {
     /// Function that returns an IP address in string form
     fn to_string(&self) -> String {
@@ -32,16 +32,6 @@ impl ToString for IpAddr {
 impl FromStr for IpAddr {
     type Err = InvalidIPErr;
     /// Function that generates a IpAddr / Err from a string
-    /// 
-    /// # Limitation
-    /// Currently only works for IPs of type IPv4 
-    /// # Example
-    /// ```
-    /// let ip: &str = "127.0.0.1";
-    /// 
-    /// let parsed_ip: IpAddr = IpAddr::from_str(ip);
-    /// ///parsed_ip = IpAddr::V4(127,0,0,1)
-    /// ```
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let split_ip = s.split('.');
         if split_ip.clone().count() != 4 {
@@ -51,10 +41,6 @@ impl FromStr for IpAddr {
         let mut ip: [u8; 4] = Default::default();
         //Go through each octet and ensure it can be parsed;
         for (i, oct) in split_ip.into_iter().enumerate() {
-            if i > ip.len() {
-                //Ip string is out of the range of the 4 octets in an IPv4 Address
-                return Err(InvalidIPErr)
-            }
             match oct.parse::<u8>() {
                 Ok(parsed_oct) => ip[i] = parsed_oct,
                 Err(_) => return Err(InvalidIPErr)
@@ -100,12 +86,9 @@ mod tests {
 
     #[test]
     #[should_panic]
-    ///Tests if an invalid Ip will cause a panic when
-    /// converting from a string to an IpAddr
     fn invalid_string_to_ip() {
         use super::*;
-        let ip = "127.0.0.0.1";
+        let ip = "Hello, world";
         IpAddr::from_str(ip).unwrap();
-        assert_eq!(IpAddr::from_str(ip), Err(InvalidIPErr))
     }
 }

src/networking/mod.rs

@@ -1,4 +1,4 @@
-pub mod ip;
+mod ip;
 use ip::IpAddr;
 
 #[allow(unused)]