Merge pull request #157 from DeterminateSystems/graham/fh-991-feature-flapping

Graham/fh 991 feature flapping

Author: grahamc

Cargo.lock

@@ -6,7 +6,7 @@ fn main() {
     ];
 
     for entry in &proto_source_files {
-        println!("cargo:rerun-if-changed={}", entry);
+        println!("cargo:rerun-if-changed={entry}");
     }
 
     prost_build::Config::new()

gha-cache/build.rs

@@ -263,7 +263,7 @@ impl fmt::Display for ApiErrorInfo {
                 write!(f, "[Unstructured] {}", String::from_utf8_lossy(bytes))
             }
             Self::Structured(e) => {
-                write!(f, "{:?}", e)
+                write!(f, "{e:?}")
             }
         }
     }
@@ -284,7 +284,7 @@ impl Api {
         headers.insert("Authorization", auth_header);
         headers.insert(
             "Accept",
-            HeaderValue::from_str(&format!("application/json;api-version={}", API_VERSION))
+            HeaderValue::from_str(&format!("application/json;api-version={API_VERSION}"))
                 .map_err(Error::init_error)?,
         );
 
@@ -358,7 +358,7 @@ impl Api {
                 .map(char::from)
                 .collect();
 
-            let full_key = format!("{}-{}", key, nonce);
+            let full_key = format!("{key}-{nonce}");
 
             match self.allocate_file(&full_key).await {
                 Ok(allocation) => {

gha-cache/src/api.rs

@@ -59,7 +59,7 @@ hyper = { version = "1.0.0", features = ["full"] }
 hyper-util = { version = "0.1", features = ["tokio", "server-auto", "http1"] }
 xdg = { version = "2.5.2" }
 color-eyre = { version = "0.6.3" }
-detsys-ids-client = "0.5.0"
+detsys-ids-client = "0.6"
 
 [dependencies.tokio]
 version = "1.44.2"

magic-nix-cache/Cargo.toml

@@ -46,7 +46,7 @@ async fn get_narinfo(
     }
 
     let store_path_hash = components[0].to_string();
-    let key = format!("{}.narinfo", store_path_hash);
+    let key = format!("{store_path_hash}.narinfo");
 
     if state
         .narinfo_negative_cache
@@ -92,14 +92,12 @@ async fn put_narinfo(
     let gha_cache = state.gha_cache.as_ref().ok_or(Error::GHADisabled)?;
 
     let store_path_hash = components[0].to_string();
-    let key = format!("{}.narinfo", store_path_hash);
+    let key = format!("{store_path_hash}.narinfo");
     let allocation = gha_cache.api.allocate_file_with_random_suffix(&key).await?;
 
     let body_stream = body.into_data_stream();
-    let stream = StreamReader::new(
-        body_stream
-            .map(|r| r.map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e.to_string()))),
-    );
+    let stream =
+        StreamReader::new(body_stream.map(|r| r.map_err(|e| std::io::Error::other(e.to_string()))));
 
     gha_cache.api.upload_file(allocation, stream).await?;
     state.metrics.narinfos_uploaded.incr();
@@ -128,7 +126,7 @@ async fn get_nar(Extension(state): Extension<State>, Path(path): Path<String>) -
 
     if let Some(upstream) = &state.upstream {
         state.metrics.nars_sent_upstream.incr();
-        Ok(Redirect::temporary(&format!("{}/nar/{}", upstream, path)))
+        Ok(Redirect::temporary(&format!("{upstream}/nar/{path}")))
     } else {
         Err(Error::NotFound)
     }
@@ -147,10 +145,8 @@ async fn put_nar(
         .await?;
 
     let body_stream = body.into_data_stream();
-    let stream = StreamReader::new(
-        body_stream
-            .map(|r| r.map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e.to_string()))),
-    );
+    let stream =
+        StreamReader::new(body_stream.map(|r| r.map_err(|e| std::io::Error::other(e.to_string()))));
 
     gha_cache.api.upload_file(allocation, stream).await?;
     state.metrics.nars_uploaded.incr();
@@ -160,7 +156,7 @@ async fn put_nar(
 
 fn pull_through(state: &State, path: &str) -> Result<Redirect> {
     if let Some(upstream) = &state.upstream {
-        Ok(Redirect::temporary(&format!("{}/{}", upstream, path)))
+        Ok(Redirect::temporary(&format!("{upstream}/{path}")))
     } else {
         Err(Error::NotFound)
     }

magic-nix-cache/src/binary_cache.rs

@@ -67,6 +67,6 @@ impl IntoResponse for Error {
             _ => StatusCode::INTERNAL_SERVER_ERROR,
         };
 
-        (code, format!("{}", self)).into_response()
+        (code, format!("{self}")).into_response()
     }
 }

magic-nix-cache/src/error.rs

@@ -71,8 +71,7 @@ pub async fn init_cache(
             netrc_file
                 .write_all(
                     format!(
-                        "\nmachine {} login {} password {}\n\n",
-                        flakehub_cache_server_hostname, flakehub_login, flakehub_password,
+                        "\nmachine {flakehub_cache_server_hostname} login {flakehub_login} password {flakehub_password}\n\n",
                     )
                     .as_bytes(),
                 )
@@ -138,13 +137,13 @@ pub async fn init_cache(
     let cache_name = {
         let mut url = flakehub_api_server
             .join("project")
-            .map_err(|_| Error::Config(format!("bad URL '{}'", flakehub_api_server)))?;
+            .map_err(|_| Error::Config(format!("bad URL '{flakehub_api_server}'")))?;
 
         if let Some(flakehub_flake_name) = flakehub_flake_name {
             if !flakehub_flake_name.is_empty() {
                 url = flakehub_api_server
-                    .join(&format!("project/{}", flakehub_flake_name))
-                    .map_err(|_| Error::Config(format!("bad URL '{}'", flakehub_api_server)))?;
+                    .join(&format!("project/{flakehub_flake_name}"))
+                    .map_err(|_| Error::Config(format!("bad URL '{flakehub_api_server}'")))?;
             }
         }
 
@@ -257,14 +256,12 @@ async fn extract_info_from_netrc(
         .to_string();
     let flakehub_login = flakehub_netrc_entry.login.ok_or_else(|| {
         Error::Config(format!(
-            "netrc file does not contain a login for '{}'",
-            flakehub_api_server
+            "netrc file does not contain a login for '{flakehub_api_server}'"
         ))
     })?;
     let flakehub_password = flakehub_netrc_entry.password.ok_or_else(|| {
         Error::Config(format!(
-            "netrc file does not contain a password for '{}'",
-            flakehub_api_server
+            "netrc file does not contain a password for '{flakehub_api_server}'"
         ))
     })?;
 

magic-nix-cache/src/flakehub.rs

@@ -176,9 +176,7 @@ async fn upload_path(
 
     let nar_stream = store.nar_from_path(path.clone());
 
-    let nar_reader = nar_stream
-        .map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))
-        .into_async_read();
+    let nar_reader = nar_stream.map_err(std::io::Error::other).into_async_read();
 
     let nar_compressor = ZstdEncoder::new(nar_reader.compat());
 
@@ -197,7 +195,7 @@ async fn upload_path(
 
     let narinfo_allocation = api.allocate_file_with_random_suffix(&narinfo_path).await?;
 
-    let narinfo = path_info_to_nar_info(store.clone(), &path_info, format!("nar/{}", nar_path))
+    let narinfo = path_info_to_nar_info(store.clone(), &path_info, format!("nar/{nar_path}"))
         .to_string()
         .expect("failed to convert path into to nar info");
 

magic-nix-cache/src/gha.rs

@@ -48,5 +48,5 @@ pub(crate) fn print_unauthenticated_error() {
             );
         }
     };
-    println!("{}", msg);
+    println!("{msg}");
 }

magic-nix-cache/src/github.rs

@@ -296,10 +296,7 @@ async fn main_cli(args: Args, recorder: detsys_ids_client::Recorder) -> Result<(
         )
         .await;
     recorder
-        .set_fact(
-            "dnixd_availability",
-            format!("{:?}", dnixd_available).into(),
-        )
+        .set_fact("dnixd_availability", format!("{dnixd_available:?}").into())
         .await;
 
     let flakehub_auth_method: Option<FlakeHubAuthSource> = match (
@@ -356,7 +353,7 @@ async fn main_cli(args: Args, recorder: detsys_ids_client::Recorder) -> Result<(
     recorder
         .set_fact(
             "flakehub_auth_method",
-            format!("{:?}", flakehub_auth_method).into(),
+            format!("{flakehub_auth_method:?}").into(),
         )
         .await;