style: clippy

Author: besaleli

encoderfile/build.rs

@@ -1,4 +1,4 @@
-const BUILD_VARS: &[&'static str] = &[
+const BUILD_VARS: &[&str] = &[
     "MODEL_WEIGHTS_PATH",
     "TOKENIZER_PATH",
     "MODEL_CONFIG_PATH",
@@ -18,7 +18,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     for var in BUILD_VARS {
         let val = std::env::var(var).expect("Missing required environment variable: {var}");
 
-        println!("cargo:rustc-env={}={}", var, val);
+        println!("cargo:rustc-env={var}={val}");
     }
 
     Ok(())

encoderfile/src/assets.rs

@@ -71,7 +71,7 @@ embed_in_section!(
 embed_in_section!(MODEL_TYPE_STR, "MODEL_TYPE", "model_type", Env);
 embed_in_section!(MODEL_ID, "MODEL_NAME", "model_id", Env);
 
-pub const BANNER: &'static str = include_str!("../../assets/banner.txt");
+pub const BANNER: &str = include_str!("../../assets/banner.txt");
 
 pub fn get_banner() -> String {
     let model_id_len = MODEL_ID.len();
@@ -82,8 +82,7 @@ pub fn get_banner() -> String {
     let spaces = " ".repeat(remaining_len);
 
     format!(
-        "{}\nModel ID: {}{}{}\n",
-        BANNER, MODEL_ID, spaces, signature
+        "{BANNER}\nModel ID: {MODEL_ID}{spaces}{signature}\n"
     )
 }
 

encoderfile/src/common/embedding.rs

@@ -33,7 +33,7 @@ impl From<EmbeddingResponse> for crate::generated::embedding::EmbeddingResponse
         Self {
             results: val.results.into_iter().map(|embs| embs.into()).collect(),
             model_id: val.model_id,
-            metadata: val.metadata.unwrap_or(HashMap::new()),
+            metadata: val.metadata.unwrap_or_default(),
         }
     }
 }

encoderfile/src/common/model_metadata.rs

@@ -13,7 +13,7 @@ impl From<GetModelMetadataResponse> for crate::generated::encoderfile::GetModelM
         Self {
             model_id: val.model_id,
             model_type: crate::generated::encoderfile::ModelType::from(val.model_type).into(),
-            id2label: val.id2label.unwrap_or(HashMap::new()),
+            id2label: val.id2label.unwrap_or_default(),
         }
     }
 }

encoderfile/src/common/sequence_classification.rs

@@ -35,7 +35,7 @@ impl From<SequenceClassificationResponse>
         Self {
             results: val.results.into_iter().map(|i| i.into()).collect(),
             model_id: val.model_id,
-            metadata: val.metadata.unwrap_or(HashMap::new()),
+            metadata: val.metadata.unwrap_or_default(),
         }
     }
 }

encoderfile/src/common/token_classification.rs

@@ -35,7 +35,7 @@ impl From<TokenClassificationResponse>
         Self {
             results: val.results.into_iter().map(|i| i.into()).collect(),
             model_id: val.model_id,
-            metadata: val.metadata.unwrap_or(HashMap::new()),
+            metadata: val.metadata.unwrap_or_default(),
         }
     }
 }

encoderfile/src/config.rs

@@ -30,7 +30,7 @@ pub fn get_model_type() -> ModelType {
             "embedding" => ModelType::Embedding,
             "sequence_classification" => ModelType::SequenceClassification,
             "token_classification" => ModelType::TokenClassification,
-            other => panic!("Invalid model type: {}", other),
+            other => panic!("Invalid model type: {other}"),
         })
         .clone()
 }
@@ -49,6 +49,6 @@ impl ModelConfig {
     }
 
     pub fn label2id(&self, label: &str) -> Option<u32> {
-        self.label2id.as_ref()?.get(label).map(|i| *i)
+        self.label2id.as_ref()?.get(label).copied()
     }
 }

encoderfile/src/inference/token_classification.rs

@@ -43,8 +43,7 @@ pub fn token_classification<'a>(
                 Some(l) => l.to_string(),
                 None => {
                     panic!(
-                        "FATAL: No label found for ID {}. Check to make sure that your config is correct.",
-                        argmax
+                        "FATAL: No label found for ID {argmax}. Check to make sure that your config is correct."
                     )
                 }
             };
@@ -61,7 +60,7 @@ pub fn token_classification<'a>(
                     start,
                     end,
                 },
-                score: score,
+                score,
                 label,
                 logits: logits
                     .index_axis(Axis(0), i)

encoderfile/src/inference/utils.rs

@@ -73,13 +73,13 @@ pub fn requires_token_type_ids<'a>(session: &MutexGuard<'a, Session>) -> bool {
 #[macro_export]
 macro_rules! run_model {
     ($session:expr, $a_ids:expr, $a_mask:expr, $a_type_ids:expr) => {{
-        match crate::inference::utils::requires_token_type_ids(&$session) {
+        match $crate::inference::utils::requires_token_type_ids(&$session) {
             true => $session.run(ort::inputs!($a_ids, $a_mask, $a_type_ids)),
             false => $session.run(ort::inputs!($a_ids, $a_mask)),
         }
         .map_err(|e| {
             tracing::error!("Error running model: {:?}", e);
-            crate::error::ApiError::InternalError("Error running model")
+            $crate::error::ApiError::InternalError("Error running model")
         })
     }};
 }

encoderfile/src/tokenizer.rs

@@ -25,7 +25,7 @@ pub fn get_tokenizer_from_string(s: &str, config: &Arc<ModelConfig>) -> Tokenize
 
     let mut tokenizer = match Tokenizer::from_str(s) {
         Ok(t) => t,
-        Err(e) => panic!("FATAL: Error loading tokenizer: {:?}", e),
+        Err(e) => panic!("FATAL: Error loading tokenizer: {e:?}"),
     };
 
     let pad_token = match tokenizer.id_to_token(pad_token_id) {