Skip to content

Commit

Permalink
cargo check fixes for Rust beta (1.65) (#2298)
Browse files Browse the repository at this point in the history
  • Loading branch information
luizirber authored Sep 25, 2022
1 parent c202b6b commit 7a96265
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/core/src/index/linear.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ where
basepath.push(path);
basepath.canonicalize()?;

let linear = LinearIndex::<L>::from_reader(&mut reader, &basepath.parent().unwrap())?;
let linear = LinearIndex::<L>::from_reader(&mut reader, basepath.parent().unwrap())?;
Ok(linear)
}

Expand Down
8 changes: 4 additions & 4 deletions src/core/src/index/revindex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ impl RevIndex {
info!("Processed {} reference sigs", i);
}

let search_sig = Signature::from_path(&filename)
let search_sig = Signature::from_path(filename)
.unwrap_or_else(|_| panic!("Error processing {:?}", filename))
.swap_remove(0);

Expand Down Expand Up @@ -215,7 +215,7 @@ impl RevIndex {
Some(
sigs_iter
.map(|ref_path| {
Signature::from_path(&ref_path)
Signature::from_path(ref_path)
.unwrap_or_else(|_| panic!("Error processing {:?}", ref_path))
.swap_remove(0)
})
Expand Down Expand Up @@ -394,7 +394,7 @@ impl RevIndex {
&refsigs[dataset_id as usize]
} else {
// TODO: remove swap_remove
ref_match = Signature::from_path(&match_path)?.swap_remove(0);
ref_match = Signature::from_path(match_path)?.swap_remove(0);
&ref_match
};

Expand Down Expand Up @@ -539,7 +539,7 @@ impl RevIndex {
&refsigs[dataset_id as usize]
} else {
// TODO: remove swap_remove
ref_match = Signature::from_path(&match_path)?.swap_remove(0);
ref_match = Signature::from_path(match_path)?.swap_remove(0);
&ref_match
};

Expand Down
2 changes: 1 addition & 1 deletion src/core/src/index/sbt/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ where
// TODO: canonicalize doesn't work on wasm32-wasi
//basepath.canonicalize()?;

let sbt = SBT::<Node<U>, T>::from_reader(&mut reader, &basepath.parent().unwrap())?;
let sbt = SBT::<Node<U>, T>::from_reader(&mut reader, basepath.parent().unwrap())?;
Ok(sbt)
}

Expand Down

0 comments on commit 7a96265

Please sign in to comment.