Get rid of the #![feature(const_fn)].

src/iface/arp_cache.rs

@@ -118,6 +118,7 @@ impl<'a> Cache for SliceCache<'a> {
 
 #[cfg(test)]
 mod test {
+    use wire::Ipv4Address;
     use super::*;
 
     const HADDR_A: EthernetAddress = EthernetAddress([0, 0, 0, 0, 0, 1]);
@@ -125,10 +126,10 @@ mod test {
     const HADDR_C: EthernetAddress = EthernetAddress([0, 0, 0, 0, 0, 3]);
     const HADDR_D: EthernetAddress = EthernetAddress([0, 0, 0, 0, 0, 4]);
 
-    const PADDR_A: IpAddress = IpAddress::v4(0, 0, 0, 0);
-    const PADDR_B: IpAddress = IpAddress::v4(0, 0, 0, 1);
-    const PADDR_C: IpAddress = IpAddress::v4(0, 0, 0, 2);
-    const PADDR_D: IpAddress = IpAddress::v4(0, 0, 0, 3);
+    const PADDR_A: IpAddress = IpAddress::Ipv4(Ipv4Address([0, 0, 0, 0]));
+    const PADDR_B: IpAddress = IpAddress::Ipv4(Ipv4Address([0, 0, 0, 1]));
+    const PADDR_C: IpAddress = IpAddress::Ipv4(Ipv4Address([0, 0, 0, 2]));
+    const PADDR_D: IpAddress = IpAddress::Ipv4(Ipv4Address([0, 0, 0, 3]));
 
     #[test]
     fn test_slice_cache() {

src/lib.rs

@@ -1,4 +1,4 @@
-#![feature(associated_consts, const_fn)]
+#![feature(associated_consts)]
 #![cfg_attr(feature = "use_alloc", feature(alloc))]
 #![no_std]
 

src/socket/tcp.rs

@@ -776,7 +776,7 @@ impl<'a> IpPayload for TcpRepr<'a> {
 
 #[cfg(test)]
 mod test {
-    use wire::IpAddress;
+    use wire::{IpAddress, Ipv4Address};
     use super::*;
 
     #[test]
@@ -807,12 +807,12 @@ mod test {
         assert_eq!(buffer.peek(3, 8), &b"bar"[..]);
     }
 
-    const LOCAL_IP:     IpAddress    = IpAddress::v4(10, 0, 0, 1);
-    const REMOTE_IP:    IpAddress    = IpAddress::v4(10, 0, 0, 2);
+    const LOCAL_IP:     IpAddress    = IpAddress::Ipv4(Ipv4Address([10, 0, 0, 1]));
+    const REMOTE_IP:    IpAddress    = IpAddress::Ipv4(Ipv4Address([10, 0, 0, 2]));
     const LOCAL_PORT:   u16          = 80;
     const REMOTE_PORT:  u16          = 49500;
-    const LOCAL_END:    IpEndpoint   = IpEndpoint::new(LOCAL_IP, LOCAL_PORT);
-    const REMOTE_END:   IpEndpoint   = IpEndpoint::new(REMOTE_IP, REMOTE_PORT);
+    const LOCAL_END:    IpEndpoint   = IpEndpoint { addr: LOCAL_IP,  port: LOCAL_PORT  };
+    const REMOTE_END:   IpEndpoint   = IpEndpoint { addr: REMOTE_IP, port: REMOTE_PORT };
     const LOCAL_SEQ:    TcpSeqNumber = TcpSeqNumber(10000);
     const REMOTE_SEQ:   TcpSeqNumber = TcpSeqNumber(-10000);
 

src/wire/ip.rs

@@ -35,7 +35,7 @@ pub enum Address {
 
 impl Address {
     /// Create an address wrapping an IPv4 address with the given octets.
-    pub const fn v4(a0: u8, a1: u8, a2: u8, a3: u8) -> Address {
+    pub fn v4(a0: u8, a1: u8, a2: u8, a3: u8) -> Address {
         Address::Ipv4(Ipv4Address([a0, a1, a2, a3]))
     }
 
@@ -88,7 +88,7 @@ impl Endpoint {
     pub const UNSPECIFIED: Endpoint = Endpoint { addr: Address::Unspecified, port: 0 };
 
     /// Create an endpoint address from given address and port.
-    pub const fn new(addr: Address, port: u16) -> Endpoint {
+    pub fn new(addr: Address, port: u16) -> Endpoint {
         Endpoint { addr: addr, port: port }
     }
 }