Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to Rust 2021 #176

Merged
merged 5 commits into from
Nov 26, 2021
Merged

Upgrade to Rust 2021 #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f124da0
Upgrade to Rust 2021
mkroening Nov 8, 2021
f9b14c0
Rust 2021: Remove new prelude uses
mkroening Nov 8, 2021
494eee0
remove clippy warnings
stlankes Nov 23, 2021
980c088
using the same toolchain like libhermit
stlankes Nov 24, 2021
b65266d
Revert "using the same toolchain like libhermit"
stlankes Nov 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benches/micro/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "micro_benchmarks"
version = "0.1.0"
authors = ["Stefan Lankes <[email protected]>"]
edition = "2018"
edition = "2021"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion benches/netbench/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
name = "rust-tcp-io-perf"
version = "0.0.0"
authors = ["Lorenzo Martini <[email protected]>"]
edition = "2018"
edition = "2021"
readme = "README.md"

description = "A Rust program to measure bandwidth or latency over a Rust TCP connection"
Expand Down
2 changes: 1 addition & 1 deletion examples/demo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "rusty_demo"
version = "0.1.0"
authors = ["Stefan Lankes <[email protected]>"]
edition = "2018"
edition = "2021"
publish = false

[[bin]]
Expand Down
2 changes: 1 addition & 1 deletion examples/hello_world/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "hello_world"
version = "0.1.0"
authors = ["Stefan Lankes <[email protected]>"]
edition = "2018"
edition = "2021"
publish = false

[target.'cfg(all(any(target_arch = "x86_64", target_arch = "aarch64"), target_os = "hermit"))'.dependencies.hermit-sys]
Expand Down
2 changes: 1 addition & 1 deletion examples/httpd/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "httpd"
authors = ["Stefan Lankes <[email protected]>"]
version = "0.1.0"
edition = "2018"
edition = "2021"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion hermit-abi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.19"
authors = ["Stefan Lankes"]
license = "MIT/Apache-2.0"
readme = "README.md"
edition = "2018"
edition = "2021"
description = """
hermit-abi is small interface to call functions from the unikernel RustyHermit.
It is used to build the target `x86_64-unknown-hermit`.
Expand Down
2 changes: 1 addition & 1 deletion hermit-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ keywords = ["unikernel", "libos"]
categories = ["os"]
links = "hermit"
build = "build.rs"
edition = "2018"
edition = "2021"
documentation = "https://hermitcore.github.io/rusty-hermit/hermit_sys"

[features]
Expand Down
2 changes: 1 addition & 1 deletion hermit-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ fn configure_cargo_rerun_if_changed(src_dir: &Path) {

WalkDir::new(src_dir)
.into_iter()
.filter_entry(|e| is_not_ignored(e))
.filter_entry(is_not_ignored)
.filter_map(|v| v.ok())
.filter_map(|v| v.path().canonicalize().ok())
.for_each(|x| println!("cargo:rerun-if-changed={}", x.display()));
Expand Down
2 changes: 0 additions & 2 deletions hermit-sys/src/net/device.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ include!(concat!(env!("OUT_DIR"), "/constants.rs"));

use std::collections::BTreeMap;
#[cfg(not(feature = "dhcpv4"))]
use std::convert::TryInto;
#[cfg(not(feature = "dhcpv4"))]
use std::net::Ipv4Addr;
use std::slice;

Expand Down
1 change: 0 additions & 1 deletion hermit-sys/src/net/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ mod waker;
use aarch64::regs::*;
#[cfg(target_arch = "x86_64")]
use std::arch::x86_64::_rdtsc;
use std::convert::TryInto;
use std::ops::DerefMut;
use std::str::FromStr;
use std::sync::atomic::{AtomicU16, Ordering};
Expand Down