Skip to content

Commit

Permalink
Merge #414
Browse files Browse the repository at this point in the history
414: switch to the latest nightly compiler r=stlankes a=stlankes

- the latest std library use random `HashMap` keys rust-lang/rust#107387
- fix typo in the creation of OpenOption for RustyHermit rust-lang/rust#109368

Co-authored-by: Stefan Lankes <slankes@eonerc.rwth-aachen.de>
  • Loading branch information
bors[bot] and stlankes committed Apr 9, 2023
2 parents 02fe1ee + 142cd91 commit 38afa50
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH \
# Manually sync this with rust-toolchain.toml!
RUST_VERSION=nightly-2023-02-14 \
RUST_VERSION=nightly-2023-04-05 \
RUST_COMPONENTS="rust-src"

RUN set -eux; \
Expand Down
2 changes: 1 addition & 1 deletion benches/netbench/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ description = "A Rust program to measure bandwidth or latency over a Rust TCP co

[dependencies]
bytes = "1.1"
clap = {verstion ="4.1", features = ["derive"] }
clap = {version ="4.1", features = ["derive"] }
core_affinity = "0.8"
hdrhist = "0.5"

Expand Down
6 changes: 3 additions & 3 deletions examples/demo/src/tests/thread_local.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
pub fn test_thread_local() -> Result<(), ()> {
#[repr(align(0x1000))]
struct OverAligned(u8);
#[repr(align(0x10))]
struct Aligned(u8);

thread_local! {
static THREAD_LOCAL: OverAligned = const { OverAligned(0x42) };
static THREAD_LOCAL: Aligned = const { Aligned(0x42) };
}

THREAD_LOCAL.with(|thread_local| {
Expand Down
2 changes: 1 addition & 1 deletion libhermit-rs
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
# Manually sync this with Dockerfile!
channel = "nightly-2023-03-15"
channel = "nightly-2023-04-05"
components = [ "rust-src" ]

0 comments on commit 38afa50

Please sign in to comment.