浏览代码

Style. NFC.

whitequark 7 年之前
父节点
当前提交
7959473308
共有 3 个文件被更改,包括 9 次插入5 次删除
  1. 2 1
      src/iface/ethernet.rs
  2. 5 3
      src/phy/mod.rs
  3. 2 1
      src/socket/icmp.rs

+ 2 - 1
src/iface/ethernet.rs

@@ -616,7 +616,8 @@ impl<'b, 'c> InterfaceInner<'b, 'c> {
                 })
             },
             Packet::Icmpv4((ipv4_repr, icmpv4_repr)) => {
-                self.dispatch_ip(tx_token, timestamp, IpRepr::Ipv4(ipv4_repr), |_ip_repr, payload| {
+                self.dispatch_ip(tx_token, timestamp, IpRepr::Ipv4(ipv4_repr),
+                                 |_ip_repr, payload| {
                     icmpv4_repr.emit(&mut Icmpv4Packet::new(payload), &checksum_caps);
                 })
             }

+ 5 - 3
src/phy/mod.rs

@@ -60,7 +60,9 @@ impl<'a> phy::Device<'a> for StmPhy {
 struct StmPhyRxToken<'a>(&'a [u8]);
 
 impl<'a> phy::RxToken for StmPhyRxToken<'a> {
-    fn consume<R, F: FnOnce(&[u8]) -> Result<R>>(self, _timestamp: u64, f: F) -> Result<R> {
+    fn consume<R, F>(self, _timestamp: u64, f: F) -> Result<R>
+        where F: FnOnce(&[u8]) -> Result<R>
+    {
         // TODO: receive packet into buffer
         let result = f(self.0);
         println!("rx called");
@@ -71,8 +73,8 @@ impl<'a> phy::RxToken for StmPhyRxToken<'a> {
 struct StmPhyTxToken<'a>(&'a mut [u8]);
 
 impl<'a> phy::TxToken for StmPhyTxToken<'a> {
-    fn consume<R, F: FnOnce(&mut [u8]) -> Result<R>>(self, _timestamp: u64, len: usize, f: F)
-        -> Result<R>
+    fn consume<R, F>(self, _timestamp: u64, len: usize, f: F) -> Result<R>
+        where F: FnOnce(&mut [u8]) -> Result<R>
     {
         let result = f(&mut self.0[..len]);
         println!("tx called {}", len);

+ 2 - 1
src/socket/icmp.rs

@@ -103,7 +103,8 @@ pub struct IcmpSocket<'a, 'b: 'a> {
 
 impl<'a, 'b> IcmpSocket<'a, 'b> {
     /// Create an ICMPv4 socket with the given buffers.
-    pub fn new(rx_buffer: SocketBuffer<'a, 'b>, tx_buffer: SocketBuffer<'a, 'b>) -> Socket<'a, 'b> {
+    pub fn new(rx_buffer: SocketBuffer<'a, 'b>,
+               tx_buffer: SocketBuffer<'a, 'b>) -> Socket<'a, 'b> {
         Socket::Icmp(IcmpSocket {
             meta:      SocketMeta::default(),
             rx_buffer: rx_buffer,