Style. NFC.

v0.7.x
whitequark 2017-11-22 07:44:03 +00:00
parent 98a3ec8c3a
commit ff530020dd
3 changed files with 9 additions and 5 deletions

View File

@ -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);
})
}

View File

@ -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);

View File

@ -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,