Skip to content

Commit beb7bd9

Browse files
Hanabi1224 upgrade deps (#1770)
* chore(deps): upgrade a few dependencies * feat: upgrade rust-toolchain * fix: clippy updates required by toolchain update * fix: rename test * fix: update rust-toolchain * fix: apply review feedback * style: remove implicit Sized bound based on feedback --------- Co-authored-by: hanabi1224 <[email protected]>
1 parent 47d71fd commit beb7bd9

File tree

38 files changed

+96
-71
lines changed

38 files changed

+96
-71
lines changed

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ byteorder = "1.3.4"
3535
cpu-time = "1.0.0"
3636
criterion = "0.3.2"
3737
dialoguer = "0.10.0"
38-
fdlimit = "0.2.0"
38+
fdlimit = "0.3"
3939
ff = "0.13.0"
4040
fil_logger = "0.1.6"
4141
generic-array = "0.14.4"
4242
gperftools = "0.2"
4343
hex = "0.4.2"
4444
humansize = "1.1.0"
45-
itertools = "0.10.3"
45+
itertools = "0.13"
4646
lazy_static = "1.2"
4747
log = "0.4.7"
4848
memmap2 = "0.5.6"
@@ -58,5 +58,5 @@ serde_json = "1.0"
5858
sha2 = "0.10.2"
5959
structopt = "0.3.12"
6060
tempfile = "3"
61-
thiserror = "1.0.6"
61+
thiserror = "2"
6262
typenum = "1.11.2"

fil-proofs-param/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ lazy_static.workspace = true
2929
log.workspace = true
3030
pbr = "1.0"
3131
rand.workspace = true
32-
reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "native-tls-vendored"] }
32+
reqwest = { version = "0.12", default-features = false, features = ["blocking", "native-tls-vendored"] }
3333
serde_json.workspace = true
3434
structopt.workspace = true
3535
tar = "0.4.26"

fil-proofs-param/src/bin/paramfetch.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,8 @@ struct FetchProgress<R> {
5151

5252
impl<R: Read> Read for FetchProgress<R> {
5353
fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
54-
self.reader.read(buf).map(|n| {
55-
self.progress_bar.add(n as u64);
56-
n
54+
self.reader.read(buf).inspect(|n| {
55+
self.progress_bar.add(*n as u64);
5756
})
5857
}
5958
}

fil-proofs-param/tests/paramfetch/session.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ impl ParamFetchSessionBuilder {
7777
s.push_str(&wl.join(","));
7878
s
7979
})
80-
.unwrap_or_else(|| "".to_string());
80+
.unwrap_or_default();
8181

8282
let json_argument = if self.manifest.is_some() {
8383
format!("--json={:?}", self.manifest.expect("missing manifest"))

fil-proofs-tooling/src/bin/benchy/porep.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ fn run_pre_commit_phases<Tree: 'static + MerkleTreeTrait>(
9494
OpenOptions::new().read(true).write(true).open(&staged_file_path)
9595
} else {
9696
info!("*** Creating staged file");
97-
OpenOptions::new().read(true).write(true).create(true).open(&staged_file_path)
97+
OpenOptions::new().read(true).write(true).create(true).truncate(true).open(&staged_file_path)
9898
}?;
9999

100100
let sealed_file_path = cache_dir.join(SEALED_FILE);
@@ -103,7 +103,7 @@ fn run_pre_commit_phases<Tree: 'static + MerkleTreeTrait>(
103103
OpenOptions::new().read(true).write(true).open(&sealed_file_path)
104104
} else {
105105
info!("*** Creating sealed file");
106-
OpenOptions::new().read(true).write(true).create(true).open(&sealed_file_path)
106+
OpenOptions::new().read(true).write(true).create(true).truncate(true).open(&sealed_file_path)
107107
}?;
108108

109109
let sector_size_unpadded_bytes_amount =
@@ -120,7 +120,7 @@ fn run_pre_commit_phases<Tree: 'static + MerkleTreeTrait>(
120120
.collect();
121121

122122
info!("*** Created piece file");
123-
let mut piece_file = OpenOptions::new().read(true).write(true).create(true).open(&piece_file_path)?;
123+
let mut piece_file = OpenOptions::new().read(true).write(true).create(true).truncate(true).open(&piece_file_path)?;
124124
piece_file.write_all(&piece_bytes)?;
125125
piece_file.sync_all()?;
126126
piece_file.rewind()?;

fil-proofs-tooling/src/bin/benchy/window_post.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ fn run_pre_commit_phases<Tree: 'static + MerkleTreeTrait>(
101101
OpenOptions::new().read(true).write(true).open(&staged_file_path)
102102
} else {
103103
info!("*** Creating staged file");
104-
OpenOptions::new().read(true).write(true).create(true).open(&staged_file_path)
104+
OpenOptions::new().read(true).write(true).create(true).truncate(true).open(&staged_file_path)
105105
}?;
106106

107107
let sealed_file_path = cache_dir.join(SEALED_FILE);
@@ -110,7 +110,7 @@ fn run_pre_commit_phases<Tree: 'static + MerkleTreeTrait>(
110110
OpenOptions::new().read(true).write(true).open(&sealed_file_path)
111111
} else {
112112
info!("*** Creating sealed file");
113-
OpenOptions::new().read(true).write(true).create(true).open(&sealed_file_path)
113+
OpenOptions::new().read(true).write(true).create(true).truncate(true).open(&sealed_file_path)
114114
}?;
115115

116116
let sector_size_unpadded_bytes_amount =
@@ -128,7 +128,7 @@ fn run_pre_commit_phases<Tree: 'static + MerkleTreeTrait>(
128128
.collect();
129129

130130
info!("*** Created piece file");
131-
let mut piece_file = OpenOptions::new().read(true).write(true).create(true).open(&piece_file_path)?;
131+
let mut piece_file = OpenOptions::new().read(true).write(true).create(true).truncate(true).open(&piece_file_path)?;
132132
piece_file.write_all(&piece_bytes)?;
133133
piece_file.sync_all()?;
134134
piece_file.rewind()?;

fil-proofs-tooling/src/bin/benchy/winning_post.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ pub fn run_fallback_post_bench<Tree: 'static + MerkleTreeTrait>(
6363
create_replica::<Tree>(sector_size, fake_replica, api_version, api_features);
6464

6565
// Store the replica's private and publicly facing info for proving and verifying respectively.
66-
let pub_replica_info = vec![(sector_id, replica_output.public_replica_info.clone())];
67-
let priv_replica_info = vec![(sector_id, replica_output.private_replica_info.clone())];
66+
let pub_replica_info = [(sector_id, replica_output.public_replica_info.clone())];
67+
let priv_replica_info = [(sector_id, replica_output.private_replica_info.clone())];
6868

6969
let post_config = PoStConfig {
7070
sector_size: sector_size.into(),
Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
fn main() {
22
fil_logger::init();
33

4-
let res = fdlimit::raise_fd_limit().expect("failed to raise fd limit");
5-
println!("File descriptor limit was raised to {}", res);
4+
match fdlimit::raise_fd_limit() {
5+
Ok(fdlimit::Outcome::LimitRaised { from, to }) => {
6+
println!("File descriptor limit was raised from {from} to {to}");
7+
}
8+
Ok(fdlimit::Outcome::Unsupported) => {
9+
panic!("failed to raise fd limit: unsupported")
10+
}
11+
Err(e) => {
12+
panic!("failed to raise fd limit: {}", e)
13+
}
14+
}
615
}

fil-proofs-tooling/src/bin/gpu-cpu-test/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ fn thread_fun(
104104
) -> RunInfo {
105105
let timing = Instant::now();
106106
let mut iteration = 0;
107-
while iteration < std::u8::MAX {
107+
while iteration < u8::MAX {
108108
info!("iter {}", iteration);
109109

110110
// This is the higher priority proof, get it on the GPU even if there is one running

fil-proofs-tooling/src/shared.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ pub fn create_replicas<Tree: 'static + MerkleTreeTrait>(
298298
let priv_infos = sealed_files
299299
.iter()
300300
.zip(seal_pre_commit_outputs.return_value.iter())
301-
.zip(cache_dirs.into_iter())
301+
.zip(cache_dirs)
302302
.map(|((sealed_file, seal_pre_commit_output), cache_dir)| {
303303
PrivateReplicaInfo::new(
304304
sealed_file.to_path_buf(),

0 commit comments

Comments
 (0)