Skip to content

Commit

Permalink
Merge pull request #767 from Furisto/update-anyhow
Browse files Browse the repository at this point in the history
Bump anyhow from 1.0.55 to 1.0.56 and fix warnings
  • Loading branch information
utam0k authored Mar 8, 2022
2 parents 6d6a7c0 + 1b98454 commit 4dcd223
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
5 changes: 2 additions & 3 deletions crates/integration_test/src/tests/cgroups/network.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,8 @@ fn get_network_interfaces() -> Option<(String, String)> {
fn test_network_cgroups() -> TestResult {
let cgroup_name = "test_network_cgroups";

let interfaces = test_result!(get_network_interfaces().ok_or(anyhow!(
"Could not find network interfaces required for test"
)));
let interfaces = test_result!(get_network_interfaces()
.ok_or_else(|| anyhow!("Could not find network interfaces required for test")));

let lo_if_name = &interfaces.0;
let eth_if_name = &interfaces.1;
Expand Down
2 changes: 1 addition & 1 deletion crates/libcgroups/src/systemd/manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ impl Manager {
}
for component in slice_name.split('-') {
if component.is_empty() {
anyhow!("invalid slice name: {}", slice);
bail!("invalid slice name: {}", slice);
}
// Append the component to the path and to the prefix.
path = format!("{}/{}{}{}", path, prefix, component, suffix);
Expand Down
2 changes: 1 addition & 1 deletion crates/test_framework/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
anyhow = "1.0.55"
anyhow = "1.0.56"
crossbeam = "0.8.1"
5 changes: 2 additions & 3 deletions crates/youki/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ version = "3.0.0-beta.5"
default-features = false
features = ["std", "suggestions", "derive", "cargo"]


[dependencies]
anyhow = "1.0.55"
anyhow = "1.0.56"
chrono = { version="0.4", features = ["serde"] }
libcgroups = { version = "0.0.2", path = "../libcgroups" }
libcontainer = { version = "0.0.2", path = "../libcontainer" }
Expand All @@ -39,5 +38,5 @@ clap_generate = { version = "3.0.0-beta.5" }
serial_test = "0.6.0"

[build-dependencies]
anyhow = "1.0.55"
anyhow = "1.0.56"
vergen = "6.0"

0 comments on commit 4dcd223

Please sign in to comment.