Skip to content

Commit 73444f2

Browse files
committed
Force rust nightly for the examples and bump of the dependencies version to make sure we don't run into rust-lang/rust#113152
1 parent 91304ef commit 73444f2

File tree

7 files changed

+22
-13
lines changed

7 files changed

+22
-13
lines changed

examples/simple_executor/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
CODESIGN := codesign
2-
CARGO := cargo
2+
CARGO := cargo +nightly
33

44
EXECUTOR := simple_executor
55
EXECUTOR_RELEASE := target/release/$(EXECUTOR)

examples/simple_fuzzer/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
CODESIGN := codesign
2-
CARGO := cargo
2+
CARGO := cargo +nightly
33

44
FUZZER := simple_fuzzer
55
FUZZER_RELEASE := target/release/$(FUZZER)

examples/simple_tracer/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
CODESIGN := codesign
2-
CARGO := cargo
2+
CARGO := cargo +nightly
33

44
EXECUTOR := simple_tracer
55
EXECUTOR_RELEASE := target/release/$(EXECUTOR)

examples/upng_fuzzer/Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ version = "0.1.0"
44
edition = "2021"
55

66
[dependencies]
7-
clap = { version = "3.2.8", features = ["derive"] }
7+
clap = { version = "4.4.8", features = ["derive"] }
8+
clap-num = "1.0.2"
89
eyre = "0.6"
9-
goblin = "0.5.2"
10-
hyperpom = { path = "../../" }
10+
goblin = "0.7.1"
11+
hyperpom = { path = "../../" }

examples/upng_fuzzer/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
CODESIGN := codesign
2-
CARGO := cargo
2+
CARGO := cargo +nightly
33

44
FUZZER := upng_fuzzer
55
FUZZER_RELEASE := target/release/$(FUZZER)

examples/upng_fuzzer/src/main.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(array_zip)]
2-
31
use clap::Parser;
42
use eyre::Result;
53

examples/upng_fuzzer/src/upngzz.rs

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,13 @@ pub struct FuzzSubCommand {
7575
nb_iterations: Option<u64>,
7676

7777
/// Physical address space size available to the fuzzer.
78-
#[clap(short = 's', long = "size", value_name = "SIZE", required = true,
79-
parse(from_str = from_hex))]
78+
#[clap(
79+
short = 's',
80+
long = "size",
81+
value_name = "SIZE",
82+
required = true,
83+
value_parser=clap_num::maybe_hex::<usize>,
84+
)]
8085
as_size: usize,
8186
}
8287

@@ -103,8 +108,13 @@ pub struct TraceSubCommand {
103108
trace: PathBuf,
104109

105110
/// Physical address space size available to the fuzzer.
106-
#[clap(short = 's', long = "size", value_name = "SIZE", required = true,
107-
parse(from_str = from_hex))]
111+
#[clap(
112+
short = 's',
113+
long = "size",
114+
value_name = "SIZE",
115+
required = true,
116+
value_parser=clap_num::maybe_hex::<usize>,
117+
)]
108118
as_size: usize,
109119
}
110120

0 commit comments

Comments
 (0)