aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-10-17 23:46:32 +0000
committerGitHub <[email protected]>2021-10-17 23:46:32 +0000
commitfdef0477410c84bca3452fca9b8719ad1f758528 (patch)
tree80d8c2a2fa3d59cf93e8ed2058ca055d6ef1a686
parent90f6b56cba8123d51631aec2ceea7262eee149c5 (diff)
parentd7b768992eadf7443a1d0cc9e4f1a82c4cce6e21 (diff)
Merge #433
433: Update nightly r=Dirbaio a=Dirbaio Co-authored-by: Dario Nieuwenhuis <[email protected]>
-rw-r--r--examples/std/src/tuntap.rs3
-rw-r--r--rust-toolchain.toml2
2 files changed, 2 insertions, 3 deletions
diff --git a/examples/std/src/tuntap.rs b/examples/std/src/tuntap.rs
index 53d3afd5c..a32099404 100644
--- a/examples/std/src/tuntap.rs
+++ b/examples/std/src/tuntap.rs
@@ -50,7 +50,6 @@ fn ifreq_ioctl(
50#[derive(Debug)] 50#[derive(Debug)]
51pub struct TunTap { 51pub struct TunTap {
52 fd: libc::c_int, 52 fd: libc::c_int,
53 ifreq: ifreq,
54 mtu: usize, 53 mtu: usize,
55} 54}
56 55
@@ -88,7 +87,7 @@ impl TunTap {
88 // smoltcp counts the entire Ethernet packet in the MTU, so add the Ethernet header size to it. 87 // smoltcp counts the entire Ethernet packet in the MTU, so add the Ethernet header size to it.
89 let mtu = ip_mtu + EthernetFrame::<&[u8]>::header_len(); 88 let mtu = ip_mtu + EthernetFrame::<&[u8]>::header_len();
90 89
91 Ok(TunTap { fd, mtu, ifreq }) 90 Ok(TunTap { fd, mtu })
92 } 91 }
93 } 92 }
94} 93}
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 00901f820..d45871808 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,6 +1,6 @@
1# Before upgrading check that everything is available on all tier1 targets here: 1# Before upgrading check that everything is available on all tier1 targets here:
2# https://rust-lang.github.io/rustup-components-history 2# https://rust-lang.github.io/rustup-components-history
3[toolchain] 3[toolchain]
4channel = "nightly-2021-08-18" 4channel = "nightly-2021-10-16"
5components = [ "rust-src", "rustfmt" ] 5components = [ "rust-src", "rustfmt" ]
6targets = [ "thumbv7em-none-eabi", "thumbv7m-none-eabi", "thumbv6m-none-eabi", "thumbv7em-none-eabihf", "thumbv8m.main-none-eabihf", "wasm32-unknown-unknown" ] 6targets = [ "thumbv7em-none-eabi", "thumbv7m-none-eabi", "thumbv6m-none-eabi", "thumbv7em-none-eabihf", "thumbv8m.main-none-eabihf", "wasm32-unknown-unknown" ]