Inline format arg (#274)

Author: trueleo

server/build.rs

@@ -24,10 +24,7 @@ fn main() {
     *config.git_mut().sha_kind_mut() = ShaKind::Short;
 
     if let Err(e) = vergen(config) {
-        println!(
-            "cargo:warning=initializing vergen failed due to error: {}",
-            e
-        );
+        println!("cargo:warning=initializing vergen failed due to error: {e}",);
     }
 
     println!("cargo:rerun-if-changed=build.rs");

server/src/alerts/target.rs

@@ -106,7 +106,7 @@ impl Target {
             state.lock().unwrap().timed_out = false;
             let mut context = alert_context;
             context.message = format!(
-                "Triggering alert did not resolve itself after {} retries, This alert is paused until it resolves", RETRIES
+                "Triggering alert did not resolve itself after {RETRIES} retries, This alert is paused until it resolves",
             );
             // Send and exit this task.
             call_target(target, context);

server/src/banner.rs

@@ -42,7 +42,7 @@ fn print_ascii_art() {
     .JMML.     `Moo9^Yo..JMML.   M9mmmP'  `Mbmmd' `Moo9^Yo. P^YbmdP'  .JMML. `Mbmmd'       
     "#;
 
-    eprint!("{}", ascii_name);
+    eprint!("{ascii_name}");
     eprintln!(
         "
     Welcome to Parseable Server!"
@@ -107,8 +107,8 @@ pub mod about {
     impl fmt::Display for ParseableVersion {
         fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
             match self {
-                ParseableVersion::Version(v) => write!(f, "{}", v),
-                ParseableVersion::Prerelease(p) => write!(f, "{}", p),
+                ParseableVersion::Version(v) => write!(f, "{v}"),
+                ParseableVersion::Prerelease(p) => write!(f, "{p}"),
             }
         }
     }
@@ -134,9 +134,8 @@ pub mod about {
 
         eprintln!(
             "
-        Commit:             \"{}\"
-        Docs:               \"https://www.parseable.io/docs\"",
-            commit_hash
+        Commit:             \"{commit_hash}\"
+        Docs:               \"https://www.parseable.io/docs\""
         );
     }
 

server/src/handlers/logstream.rs

@@ -60,10 +60,7 @@ pub async fn delete(req: HttpRequest) -> Result<impl Responder, StreamError> {
         )
     }
 
-    Ok((
-        format!("log stream {} deleted", stream_name),
-        StatusCode::OK,
-    ))
+    Ok((format!("log stream {stream_name} deleted"), StatusCode::OK))
 }
 
 pub async fn list(_: HttpRequest) -> impl Responder {
@@ -135,8 +132,7 @@ pub async fn put_stream(req: HttpRequest) -> Result<impl Responder, StreamError>
         // Error if the log stream already exists
         return Err(StreamError::Custom {
             msg: format!(
-                "log stream {} already exists, please create a new log stream with unique name",
-                stream_name
+                "log stream {stream_name} already exists, please create a new log stream with unique name"
             ),
             status: StatusCode::BAD_REQUEST,
         });
@@ -194,7 +190,7 @@ pub async fn put_alert(
         .expect("alerts set on existing stream");
 
     Ok((
-        format!("set alert configuration for log stream {}", stream_name),
+        format!("set alert configuration for log stream {stream_name}"),
         StatusCode::OK,
     ))
 }
@@ -255,10 +251,7 @@ pub async fn create_stream(stream_name: String) -> Result<(), StreamError> {
     if let Err(e) = storage.create_stream(&stream_name).await {
         // Fail if unable to create log stream on object store backend
         return Err(StreamError::Custom {
-            msg: format!(
-                "failed to create log stream {} due to err: {}",
-                stream_name, e
-            ),
+            msg: format!("failed to create log stream {stream_name} due to err: {e}"),
             status: StatusCode::INTERNAL_SERVER_ERROR,
         });
     }

server/src/main.rs

@@ -325,14 +325,14 @@ macro_rules! create_app {
 }
 
 fn base_path() -> String {
-    format!("{}/{}", API_BASE_PATH, API_VERSION)
+    format!("{API_BASE_PATH}/{API_VERSION}")
 }
 
 fn logstream_path(stream_name: &str) -> String {
     if stream_name.is_empty() {
         "/logstream".to_string()
     } else {
-        format!("/logstream/{}", stream_name)
+        format!("/logstream/{stream_name}")
     }
 }
 

server/src/option.rs

@@ -104,8 +104,7 @@ impl Config {
                 cause = inner
             ),
             Err(ObjectStorageError::AuthenticationError(inner)) => panic!(
-                "Failed to authenticate. Please ensure credentials are valid\n Caused by: {cause}",
-                cause = inner
+                "Failed to authenticate. Please ensure credentials are valid\n Caused by: {inner}"
             ),
             Err(error) => {
                 panic!("{error}")

server/src/storage.rs

@@ -211,7 +211,7 @@ impl StorageDir {
             + &utils::minute_to_prefix(time.minute(), OBJECT_STORE_DATA_GRANULARITY).unwrap();
         let local_uri = str::replace(&uri, "/", ".");
         let hostname = utils::hostname_unchecked();
-        format!("{}{}.data.arrows", local_uri, hostname)
+        format!("{local_uri}{hostname}.data.arrows")
     }
 
     fn filename_by_current_time() -> String {

server/src/storage/object_storage.rs

@@ -245,7 +245,7 @@ pub trait ObjectStorage: Sync + 'static {
                     .to_str()
                     .expect("filename is valid string");
                 let file_suffix = str::replacen(filename, ".", "/", 3);
-                let objectstore_path = format!("{}/{}", stream, file_suffix);
+                let objectstore_path = format!("{stream}/{file_suffix}");
 
                 CACHED_FILES
                     .lock()

server/src/storage/s3.rs

@@ -180,7 +180,7 @@ impl S3 {
             .client
             .list_objects_v2()
             .bucket(&self.bucket)
-            .prefix(format!("{}/", stream_name))
+            .prefix(format!("{stream_name}/"))
             .into_paginator()
             .send();
 

server/src/utils.rs

@@ -71,7 +71,7 @@ pub mod header_parsing {
                 return Err(ParseHeaderError::SeperatorInValue(kv_separator));
             }
 
-            labels.push(format!("{}={}", key, value));
+            labels.push(format!("{key}={value}"));
         }
 
         if labels.len() > MAX_HEADERS_ALLOWED {
@@ -233,20 +233,20 @@ pub fn minute_to_slot(minute: u32, data_granularity: u32) -> Option<String> {
     let block_n = minute / data_granularity;
     let block_start = block_n * data_granularity;
     if data_granularity == 1 {
-        return Some(format!("{:02}", block_start));
+        return Some(format!("{block_start:02}"));
     }
 
     let block_end = (block_n + 1) * data_granularity - 1;
-    Some(format!("{:02}-{:02}", block_start, block_end))
+    Some(format!("{block_start:02}-{block_end:02}"))
 }
 
 pub fn date_to_prefix(date: NaiveDate) -> String {
-    let date = format!("date={}/", date);
+    let date = format!("date={date}/");
     date.replace("UTC", "")
 }
 
 pub fn hour_to_prefix(hour: u32) -> String {
-    format!("hour={:02}/", hour)
+    format!("hour={hour:02}/")
 }
 
 pub fn minute_to_prefix(minute: u32, data_granularity: u32) -> Option<String> {
@@ -272,7 +272,7 @@ impl TimePeriod {
     }
 
     pub fn generate_prefixes(&self, prefix: &str) -> Vec<String> {
-        let prefix = format!("{}/", prefix);
+        let prefix = format!("{prefix}/");
 
         let end_minute = self.end.minute() + u32::from(self.end.second() > 0);