Fix build

Author: apanda

build-container/Dockerfile

@@ -12,5 +12,5 @@ RUN apt-get -yq update && apt-get -yq install libssl-dev \
 RUN mkdir -p ~/.ssh && ssh-keyscan -t rsa github.com > ~/.ssh/known_hosts
 RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly -y
 ENV PATH /root/.cargo/bin:$PATH
-RUN cargo install rustfmt
+RUN cargo install rustfmt-nightly || true
 CMD [/bin/bash]

framework/src/control/linux/epoll.rs

@@ -17,7 +17,10 @@ impl PollHandle {
     }
 
     pub fn schedule_read_rawfd(&self, fd: RawFd, token: Token) {
-        let mut event = EpollEvent::new(EPOLLIN | EPOLLET | EPOLLONESHOT, token);
+        let mut event = EpollEvent::new(
+            EpollFlags::EPOLLIN | EpollFlags::EPOLLET | EpollFlags::EPOLLONESHOT,
+            token,
+        );
         epoll_ctl(self.epoll_fd, EpollOp::EpollCtlMod, fd, &mut event).unwrap();
     }
 
@@ -26,7 +29,10 @@ impl PollHandle {
     }
 
     pub fn schedule_write_rawfd(&self, fd: RawFd, token: Token) {
-        let mut event = EpollEvent::new(EPOLLOUT | EPOLLET | EPOLLONESHOT, token);
+        let mut event = EpollEvent::new(
+            EpollFlags::EPOLLOUT | EpollFlags::EPOLLET | EpollFlags::EPOLLONESHOT,
+            token,
+        );
         epoll_ctl(self.epoll_fd, EpollOp::EpollCtlMod, fd, &mut event).unwrap();
     }
 
@@ -36,7 +42,7 @@ impl PollHandle {
     }
 
     pub fn new_io_fd(&self, fd: RawFd, token: Token) {
-        let mut event = EpollEvent::new(EPOLLET | EPOLLONESHOT, token);
+        let mut event = EpollEvent::new(EpollFlags::EPOLLET | EpollFlags::EPOLLONESHOT, token);
         epoll_ctl(self.epoll_fd, EpollOp::EpollCtlAdd, fd, &mut event).unwrap();
     }
 }
@@ -71,13 +77,13 @@ impl PollScheduler {
     #[inline]
     fn epoll_kind_to_available(&self, kind: &EpollFlags) -> Available {
         let mut available = NONE;
-        if kind.contains(EPOLLIN) {
+        if kind.contains(EpollFlags::EPOLLIN) {
             available |= READ
         };
-        if kind.contains(EPOLLOUT) {
+        if kind.contains(EpollFlags::EPOLLOUT) {
             available |= WRITE
         };
-        if kind.contains(EPOLLHUP) || kind.contains(EPOLLERR) {
+        if kind.contains(EpollFlags::EPOLLHUP) || kind.contains(EpollFlags::EPOLLERR) {
             available |= HUP
         };
         available

framework/src/headers/ip.rs

@@ -185,7 +185,7 @@ impl IpHeader {
     pub fn fragment_offset(&self) -> u16 {
         let id_flag_fragment = self.id_to_foffset;
         let flag_fragment = (id_flag_fragment & 0xffff) as u16;
-        u16::from_be(((flag_fragment & !0xe) >> 3))
+        u16::from_be((flag_fragment & !0xe) >> 3)
     }
 
     #[inline]

framework/src/lib.rs

@@ -9,6 +9,8 @@
 #![feature(heap_api)]
 #![feature(unique)]
 #![feature(const_fn)]
+// FIXME: Figure out if this is really the right thing here.
+#![feature(ptr_internals)]
 // Used for cache alignment.
 #![feature(allocator_api)]
 #![allow(unused_features)]

framework/src/native/libnuma.rs

@@ -104,8 +104,7 @@ impl Eq for Bitmask {}
 impl Bitmask {
     pub unsafe fn allocate_node_mask() -> Bitmask {
         Bitmask {
-            bitmask: wrapped::numa_bitmask_clearall(wrapped::numa_bitmask_alloc(numa_num_possible_nodes()
-                as u32)),
+            bitmask: wrapped::numa_bitmask_clearall(wrapped::numa_bitmask_alloc(numa_num_possible_nodes() as u32)),
         }
     }
 

framework/src/operators/packet_batch.rs

@@ -144,7 +144,7 @@ impl PacketBatch {
                     let len = self.scratch.len();
                     // No need to offset here since self.scratch is tight.
                     let array_ptr = self.scratch.as_mut_ptr();
-                    let ret = mbuf_free_bulk(array_ptr, (len as i32));
+                    let ret = mbuf_free_bulk(array_ptr, len as i32);
                     self.scratch.clear();
                     if ret == 0 {
                         Some(len)

framework/src/utils/flow.rs

@@ -125,7 +125,7 @@ pub fn crc_hash<T: Sized>(to_hash: &T, iv: u32) -> u32 {
 
 fn flow_as_u8(flow: &Flow) -> &[u8] {
     let size = mem::size_of::<Flow>();
-    unsafe { slice::from_raw_parts(((flow as *const Flow) as *const u8), size) }
+    unsafe { slice::from_raw_parts((flow as *const Flow) as *const u8, size) }
 }
 
 #[inline]

framework/tests/tcp_window.rs

@@ -473,11 +473,9 @@ fn test_overlapping_write() {
     let read = r0.read_data(&mut read_buf[..]);
     let read_str = str::from_utf8(&read_buf[..read]).unwrap();
     assert_eq!(
-        read_str,
-        "hello world",
+        read_str, "hello world",
         "Read value {} expected {}",
-        read_str,
-        "hello world"
+        read_str, "hello world"
     );
 
     if let InsertionResult::Inserted { written, .. } = r0.add_data(base_seq, data0.as_bytes()) {