Merge #115

115: switching to smoltcp 0.7 r=stlankes a=stlankes - using the latest rust toolchain Co-authored-by: Stefan Lankes <slankes@eonerc.rwth-aachen.de>
hermit-os · Feb 15, 2021 · c00a728 · c00a728
2 parents a80de1f + 98162b3
commit c00a728
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/hermit-sys/Cargo.toml b/hermit-sys/Cargo.toml
@@ -46,7 +46,7 @@ version = "0.*"
 default-features = false
 
 [dependencies.smoltcp]
-version = "0.6.0"
+version = "0.7.0"
 optional = true
 default-features = false
 features = ["std", "ethernet", "socket-udp", "socket-tcp", "proto-ipv4", "proto-ipv6"]

diff --git a/hermit-sys/src/net/mod.rs b/hermit-sys/src/net/mod.rs
@@ -87,10 +87,10 @@ pub enum WaitForResult {
 
 pub struct NetworkInterface<T: for<'a> Device<'a>> {
 	#[cfg(feature = "trace")]
-	pub iface: smoltcp::iface::EthernetInterface<'static, 'static, 'static, EthernetTracer<T>>,
+	pub iface: smoltcp::iface::EthernetInterface<'static, EthernetTracer<T>>,
 	#[cfg(not(feature = "trace"))]
-	pub iface: smoltcp::iface::EthernetInterface<'static, 'static, 'static, T>,
-	pub sockets: SocketSet<'static, 'static, 'static>,
+	pub iface: smoltcp::iface::EthernetInterface<'static, T>,
+	pub sockets: SocketSet<'static>,
 	pub wait_for: BTreeMap<Handle, WaitFor>,
 	#[cfg(feature = "dhcpv4")]
 	dhcp: Dhcpv4Client,

diff --git a/libhermit-rs b/libhermit-rs
diff --git a/rust-toolchain b/rust-toolchain
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2021-01-22"
+channel = "nightly-2021-02-11"
 components = [ "rustfmt", "rust-src", "llvm-tools-preview"]
 targets = [ "x86_64-unknown-hermit" ]