adapted for rustc 1.76.0-nightly (ba7c7a301 2023-11-13):

rstade · rstade · commit 872359a6fc4e · 2023-11-14T23:00:04.000+01:00
- updated box to Box syntax
- feature "event" in nix crate
diff --git a/framework/Cargo.toml b/framework/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "e2d2"
-version = "1.0.8"
+version = "1.0.9"
 authors = ["Aurojit Panda <apanda@cs.berkeley.edu>", "Rainer Stademann"]
 build = "build.rs"
 
@@ -20,7 +20,7 @@ regex = "*"
 lazy_static = "*"
 net2 = "*"
 # NIX restricts us to just unix for now, we can fix this if someone cares at a later point.
-nix = ">=0.10.0"
+nix = { version = ">=0.27.1", features =["event"] }
 toml = "0.6"
 # Hack for SHM
 uuid= { version = ">=0.7", features=["v4"] }
@@ -36,3 +36,4 @@ ipnet = ">=1.0"
 default = []
 performance = []
 packet_offset = []
+
diff --git a/test/acl-fw/src/main.rs b/test/acl-fw/src/main.rs
@@ -1,4 +1,3 @@
-#![feature(box_syntax)]
 extern crate e2d2;
 extern crate fnv;
 extern crate getopts;
diff --git a/test/acl-fw/src/nf.rs b/test/acl-fw/src/nf.rs
@@ -39,10 +39,10 @@ impl Acl {
 pub fn acl_match<T: 'static + Batch>(parent: T, acls: Vec<Acl>) -> CompositionBatch {
     let mut flow_cache = HashSet::<FiveTupleV4, FnvHash>::with_hasher(Default::default());
     parent
-        .transform(box move |p| {
+        .transform(Box::new(move |p| {
             p.headers_mut().mac_mut(0).swap_addresses();
-        })
-        .filter(box move |p| {
+        }))
+        .filter(Box::new(move |p| {
             let flow = p.headers().ip(1).flow().unwrap();
             for acl in &acls {
                 if acl.matches(&flow, &flow_cache) {
@@ -53,6 +53,6 @@ pub fn acl_match<T: 'static + Batch>(parent: T, acls: Vec<Acl>) -> CompositionBa
                 }
             }
             return false;
-        })
+        }))
         .compose()
 }
diff --git a/test/chain-test/src/main.rs b/test/chain-test/src/main.rs
@@ -1,5 +1,3 @@
-#![feature(box_syntax)]
-
 extern crate e2d2;
 extern crate eui48;
 extern crate fnv;
diff --git a/test/chain-test/src/nf.rs b/test/chain-test/src/nf.rs
@@ -3,19 +3,19 @@ use e2d2::operators::*;
 #[inline]
 pub fn chain_nf<T: 'static + Batch>(parent: T) -> CompositionBatch {
     let next = parent
-        .transform(box move |pkt| {
+        .transform(Box::new(move |pkt| {
             let hdr = pkt.headers_mut().mac_mut(0);
             hdr.swap_addresses();
-        })
-        .transform(box |pkt| {
+        }))
+        .transform(Box::new(|pkt| {
             let h = pkt.headers_mut().ip_mut(1);
             let ttl = h.ttl();
             h.set_ttl(ttl - 1);
-        })
-        .filter(box |pkt| {
+        }))
+        .filter(Box::new(|pkt| {
             let h = pkt.headers().ip(1);
             h.ttl() != 0
-        });
+        }));
     CompositionBatch::new(next)
 }
 
@@ -26,10 +26,10 @@ pub fn chain<S: 'static + Batch>(parent: S, len: u32, pos: u32) -> CompositionBa
         chained = chain_nf(chained);
     }
     let next = if len % 2 == 0 || pos % 2 == 1 {
-        CompositionBatch::new(chained.transform(box move |pkt| {
+        CompositionBatch::new(chained.transform(Box::new(move |pkt| {
             let hdr = pkt.headers_mut().mac_mut(0);
             hdr.swap_addresses();
-        }))
+        })))
     } else {
         chained
     };
diff --git a/test/delay-test/src/main.rs b/test/delay-test/src/main.rs
@@ -1,4 +1,3 @@
-#![feature(box_syntax)]
 extern crate e2d2;
 extern crate fnv;
 extern crate getopts;
diff --git a/test/delay-test/src/nf.rs b/test/delay-test/src/nf.rs
@@ -18,10 +18,10 @@ fn delay_loop(delay: u64) {
 }
 
 pub fn delay<T: 'static + Batch>(parent: T, delay: u64) -> TransformBatch<T> {
-    parent.transform(box move |pkt| {
+    parent.transform(Box::new(move |pkt| {
         assert!(pkt.refcnt() == 1);
         let hdr = pkt.headers_mut().mac_mut(0);
         hdr.swap_addresses();
         delay_loop(delay);
-    })
+    }))
 }
diff --git a/test/framework/src/main.rs b/test/framework/src/main.rs
@@ -1,4 +1,3 @@
-#![feature(box_syntax)]
 extern crate e2d2;
 extern crate getopts;
 extern crate rand;
@@ -25,16 +24,16 @@ fn monitor<T: 'static + Batch>(
     mut monitoring_cache: MergeableStoreDP<isize>,
 ) -> TransformBatch<TransformBatch<T>> {
     parent
-        .transform(box |pkt| {
+        .transform(Box::new(|pkt| {
             let hdr = pkt.headers_mut().mac_mut(0);
             hdr.swap_addresses();
-        })
-        .transform(box move |pkt| {
+        }))
+        .transform(Box::new(move |pkt| {
             let hdr = pkt.headers_mut().ip_mut(1);
             let ttl = hdr.ttl();
             hdr.set_ttl(ttl + 1);
             monitoring_cache.update(hdr.flow().unwrap(), 1);
-        })
+        }))
 }
 
 fn recv_thread(ports: Vec<CacheAligned<PortQueue>>, core: i32, counter: MergeableStoreDP<isize>) {
@@ -45,7 +44,7 @@ fn recv_thread(ports: Vec<CacheAligned<PortQueue>>, core: i32, counter: Mergeabl
         .iter()
         .map(|port| {
             let ctr = counter.clone();
-            box monitor(ReceiveBatch::new(port.clone()), ctr).send(port.clone()) as Box<dyn Batch>
+            Box::new(monitor(ReceiveBatch::new(port.clone()), ctr).send(port.clone())) as Box<dyn Batch>
         })
         .collect();
     println!("Running {} pipelines", pipelines.len());
diff --git a/test/lpm/src/main.rs b/test/lpm/src/main.rs
@@ -1,4 +1,3 @@
-#![feature(box_syntax)]
 extern crate e2d2;
 extern crate fnv;
 extern crate getopts;
diff --git a/test/lpm/src/nf.rs b/test/lpm/src/nf.rs
@@ -208,21 +208,21 @@ pub fn lpm<T: 'static + Batch, S: Scheduler + Sized>(parent: T, s: &mut S) -> Co
     lpm_table.construct_table();
     let uuid = Uuid::new_v4();
     let mut groups = parent
-        .transform(box |p| p.headers_mut().mac_mut(0).swap_addresses())
+        .transform(Box::new(|p| p.headers_mut().mac_mut(0).swap_addresses()))
         .group_by(
             3,
-            box move |pkt| {
+            Box::new(move |pkt| {
                 let hdr = pkt.headers().ip(1);
                 lpm_table.lookup_entry(hdr.src()) as usize
-            },
+            }),
             s,
             "lpm_groups".to_string(),
             uuid,
         );
     let pipeline = merge_batches(vec![
-        box groups.get_group(0).unwrap(),
-        box groups.get_group(1).unwrap(),
-        box groups.get_group(2).unwrap(),
+        Box::new(groups.get_group(0).unwrap()),
+        Box::new(groups.get_group(1).unwrap()),
+        Box::new(groups.get_group(2).unwrap()),
     ])
     .compose();
     pipeline
diff --git a/test/macswap/src/main.rs b/test/macswap/src/main.rs
@@ -1,4 +1,3 @@
-#![feature(box_syntax)]
 extern crate e2d2;
 extern crate fnv;
 extern crate getopts;
diff --git a/test/macswap/src/nf.rs b/test/macswap/src/nf.rs
@@ -1,9 +1,9 @@
 use e2d2::operators::*;
 
 pub fn macswap<T: 'static + Batch>(parent: T) -> TransformBatch<T> {
-    parent.transform(box move |pkt| {
+    parent.transform(Box::new(move |pkt| {
         assert!(pkt.refcnt() == 1);
         let hdr = pkt.headers_mut().mac_mut(0);
         hdr.swap_addresses();
-    })
+    }))
 }
diff --git a/test/maglev/src/main.rs b/test/maglev/src/main.rs
@@ -1,4 +1,3 @@
-#![feature(box_syntax)]
 extern crate e2d2;
 extern crate fnv;
 extern crate getopts;
diff --git a/test/maglev/src/nf.rs b/test/maglev/src/nf.rs
@@ -43,7 +43,7 @@ impl Maglev {
 
     fn generate_lut(permutations: &Vec<Vec<usize>>, size: usize) -> Box<Vec<usize>> {
         let mut next: Vec<_> = permutations.iter().map(|_| 0).collect();
-        let mut entry: Box<Vec<usize>> = box ((0..size).map(|_| 0x8000).collect());
+        let mut entry: Box<Vec<usize>> = Box::new((0..size).map(|_| 0x8000).collect());
         let mut n = 0;
         println!("Generating LUT");
         while n < size {
@@ -68,7 +68,7 @@ impl Maglev {
     }
 
     pub fn new(name: &[&str], lsize: usize) -> Maglev {
-        let permutations = box Maglev::generate_permutations(name, lsize);
+        let permutations = Box::new(Maglev::generate_permutations(name, lsize));
         Maglev {
             lut: Maglev::generate_lut(&*permutations, lsize),
             lut_size: lsize,
@@ -87,19 +87,19 @@ pub fn maglev<T: 'static + Batch, S: Scheduler + Sized>(parent: T, s: &mut S, ba
     let mut cache = HashMap::<usize, usize, FnvHash>::with_hasher(Default::default());
     let uuid = Uuid::new_v4();
     let mut groups = parent
-        .transform(box move |pkt| {
+        .transform(Box::new(move |pkt| {
             assert!(pkt.refcnt() == 1);
             let hdr = pkt.headers_mut().mac_mut(0);
             hdr.swap_addresses();
-        })
+        }))
         .group_by(
             ct,
-            box move |pkt| {
+            Box::new(move |pkt| {
                 let payload = pkt.get_payload(0);
                 let hash = ipv4_flow_hash(payload, 0);
                 let out = cache.entry(hash).or_insert_with(|| lut.lookup(hash));
                 *out
-            },
+            }),
             s,
             "GroupBy".to_string(),
             uuid,
diff --git a/test/nat/src/main.rs b/test/nat/src/main.rs
@@ -1,4 +1,3 @@
-#![feature(box_syntax)]
 extern crate e2d2;
 extern crate fnv;
 extern crate getopts;
diff --git a/test/nat/src/nf.rs b/test/nat/src/nf.rs
@@ -26,7 +26,7 @@ pub fn nat<T: 'static + Batch>(parent: T, _s: &mut dyn Scheduler, nat_ip: &Ipv4A
     let mut next_port = 1024;
     const MIN_PORT: u16 = 1024;
     const MAX_PORT: u16 = 65535;
-    let pipeline = parent.transform(box move |pkt| {
+    let pipeline = parent.transform(Box::new(move |pkt| {
         let payload = pkt.get_payload_mut(0);
         let flow = ipv4_extract_flow(payload);
         let found = match port_hash.get(&flow) {
@@ -53,6 +53,6 @@ pub fn nat<T: 'static + Batch>(parent: T, _s: &mut dyn Scheduler, nat_ip: &Ipv4A
                 outgoing_flow.ipv4_stamp_flow(payload);
             }
         }
-    });
+    }));
     pipeline.compose()
 }
diff --git a/test/packet_generation/src/main.rs b/test/packet_generation/src/main.rs
@@ -1,4 +1,3 @@
-#![feature(box_syntax)]
 extern crate e2d2;
 extern crate eui48;
 extern crate fnv;
diff --git a/test/packet_test/src/main.rs b/test/packet_test/src/main.rs
@@ -1,4 +1,3 @@
-#![feature(box_syntax)]
 extern crate e2d2;
 extern crate eui48;
 extern crate fnv;
diff --git a/test/packet_test/src/nf.rs b/test/packet_test/src/nf.rs
@@ -7,9 +7,9 @@ pub fn delay<T: 'static + Batch>(parent: T) -> TransformBatch<T> {
     m.dst = MacAddress::new([0x68, 0x05, 0xca, 0x33, 0xff, 0x79]);
     m.src = MacAddress::new([0x68, 0x05, 0xca, 0x33, 0xfd, 0xc8]);
     m.set_etype(0x800);
-    parent.transform(box move |pkt| {
+    parent.transform(Box::new(move |pkt| {
         pkt.replace_header(0, &Header::new(&mut m as *mut MacHeader));
-    })
+    }))
     // parent.parse::<MacHeader>()
     // .transform(box move |pkt| {
     // assert!(pkt.refcnt() == 1);
diff --git a/test/shutdown-test/src/main.rs b/test/shutdown-test/src/main.rs
@@ -1,4 +1,3 @@
-#![feature(box_syntax)]
 extern crate e2d2;
 extern crate fnv;
 extern crate getopts;
diff --git a/test/shutdown-test/src/nf.rs b/test/shutdown-test/src/nf.rs
@@ -18,10 +18,10 @@ fn delay_loop(delay: u64) {
 }
 
 pub fn delay<T: 'static + Batch>(parent: T, delay: u64) -> TransformBatch<T> {
-    parent.transform(box move |pkt| {
+    parent.transform(Box::new(move |pkt| {
         assert!(pkt.refcnt() == 1);
         let hdr = pkt.headers_mut().mac_mut(0);
         hdr.swap_addresses();
         delay_loop(delay);
-    })
+    }))
 }
diff --git a/test/tcp_check/src/main.rs b/test/tcp_check/src/main.rs
@@ -1,4 +1,3 @@
-#![feature(box_syntax)]
 extern crate e2d2;
 extern crate fnv;
 extern crate getopts;
diff --git a/test/tcp_check/src/nf.rs b/test/tcp_check/src/nf.rs
@@ -4,16 +4,16 @@ use e2d2::operators::*;
 #[inline]
 pub fn tcp_nf<T: 'static + Batch>(parent: T) -> CompositionBatch {
     parent
-        .map(box |pkt| {
+        .map(Box::new(|pkt| {
             println!("hdr {}", pkt.headers());
             let payload = pkt.get_payload(0);
             print!("Payload: ");
             for p in payload {
                 print!("{:x} ", p);
             }
             println!();
-        })
-        .map(box |pkt| {
+        }))
+        .map(Box::new(|pkt| {
             let hdr = pkt.headers().ip(1);
             let flow = hdr.flow().unwrap();
             let payload = pkt.get_payload(1);
@@ -23,9 +23,9 @@ pub fn tcp_nf<T: 'static + Batch>(parent: T) -> CompositionBatch {
                 payload[0], payload[1], payload[2], payload[3]
             );
             println!("Src {} dst {}", { flow.src_port }, { flow.dst_port });
-        })
-        .map(box |pkt| {
+        }))
+        .map(Box::new(|pkt| {
             println!("TCP header {}", pkt.headers().tcp(2));
-        })
+        }))
         .compose()
 }
diff --git a/test/tcp_payload/src/main.rs b/test/tcp_payload/src/main.rs
@@ -1,4 +1,3 @@
-#![feature(box_syntax)]
 extern crate e2d2;
 extern crate fnv;
 extern crate getopts;
diff --git a/test/tcp_payload/src/nf.rs b/test/tcp_payload/src/nf.rs
@@ -35,20 +35,20 @@ pub fn reconstruction<T: 'static + Batch, S: Scheduler + Sized>(parent: T, sched
     let mut payload_cache = HashMap::<FiveTupleV4, Vec<u8>>::with_hasher(Default::default());
     let uuid = Uuid::new_v4();
     let mut groups = parent
-        .transform(box move |p| {
+        .transform(Box::new(move |p| {
             p.headers_mut().mac_mut(0).swap_addresses();
-        })
+        }))
         .group_by(
             2,
-            box move |p| if p.headers().ip(1).protocol() == 6 { 0 } else { 1 },
+            Box::new(move |p| if p.headers().ip(1).protocol() == 6 { 0 } else { 1 }),
             sched,
             "GroupByProtocol".to_string(),
             uuid,
         );
     let pipe = groups
         .get_group(0)
         .unwrap()
-        .transform(box move |p| {
+        .transform(Box::new(move |p| {
             let flow = p.headers().ip(1).flow().unwrap();
             let mut seq = p.headers().tcp(2).seq_num();
             match rb_map.entry(flow) {
@@ -108,7 +108,7 @@ pub fn reconstruction<T: 'static + Batch, S: Scheduler + Sized>(parent: T, sched
                     }
                 }
             }
-        })
+        }))
         .compose();
     merge(vec![pipe, groups.get_group(1).unwrap().compose()]).compose()
 }
diff --git a/test/tcp_reconstruction/src/main.rs b/test/tcp_reconstruction/src/main.rs
@@ -1,4 +1,3 @@
-#![feature(box_syntax)]
 extern crate e2d2;
 extern crate fnv;
 extern crate getopts;
diff --git a/test/tcp_reconstruction/src/nf.rs b/test/tcp_reconstruction/src/nf.rs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#![feature(box_syntax)]`
`2`	`1`	`extern crate e2d2;`
`3`	`2`	`extern crate fnv;`
`4`	`3`	`extern crate getopts;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#![feature(box_syntax)]`
`2`		`-`
`3`	`1`	`extern crate e2d2;`
`4`	`2`	`extern crate eui48;`
`5`	`3`	`extern crate fnv;`
Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,10 @@ fn delay_loop(delay: u64) {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`pub fn delay<T: 'static + Batch>(parent: T, delay: u64) -> TransformBatch<T> {`
`21`		`- parent.transform(box move \|pkt\| {`
	`21`	`+ parent.transform(Box::new(move \|pkt\| {`
`22`	`22`	`assert!(pkt.refcnt() == 1);`
`23`	`23`	`let hdr = pkt.headers_mut().mac_mut(0);`
`24`	`24`	`hdr.swap_addresses();`
`25`	`25`	`delay_loop(delay);`
`26`		`- })`
	`26`	`+ }))`
`27`	`27`	`}`