Skip to content

Commit

Permalink
build: update Rust toolchain to 1.66
Browse files Browse the repository at this point in the history
  • Loading branch information
CBenoit committed Dec 23, 2022
1 parent b89d553 commit 561dcbb
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion devolutions-gateway/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ impl ConfHandle {
fn save_config(conf: &dto::ConfFile) -> anyhow::Result<()> {
let conf_file_path = get_conf_file_path();
let json = serde_json::to_string_pretty(conf).context("Failed JSON serialization of configuration")?;
std::fs::write(&conf_file_path, &json).with_context(|| format!("Failed to write file at {conf_file_path}"))?;
std::fs::write(&conf_file_path, json).with_context(|| format!("Failed to write file at {conf_file_path}"))?;
Ok(())
}

Expand Down
13 changes: 5 additions & 8 deletions devolutions-gateway/src/http/controllers/health.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,11 @@ fn get_health(controller: &HealthController, req: Request) -> Result<HealthRespo
.into_iter()
.flat_map(|hval| hval.split(','))
{
match hval {
"application/json" => {
return Ok(HealthResponse::Identity(Identity {
id: conf.id,
hostname: conf.hostname.clone(),
}))
}
_ => {}
if hval == "application/json" {
return Ok(HealthResponse::Identity(Identity {
id: conf.id,
hostname: conf.hostname.clone(),
}));
}
}

Expand Down
3 changes: 2 additions & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
[toolchain]
channel = "1.65.0"
channel = "1.66.0"
components = ["rustfmt", "clippy"]

0 comments on commit 561dcbb

Please sign in to comment.