fmt and clippy

Author: DrJesseGlass

candle-examples/examples/smollm3/main.rs

@@ -9,8 +9,8 @@ use clap::{Parser, ValueEnum};
 use std::io::Write;
 
 use candle::{DType, Device, Tensor};
+use candle_examples::chat_template::{ChatTemplate, ChatTemplateOptions, Message};
 use candle_examples::token_output_stream::TokenOutputStream;
-use candle_examples::chat_template::{ChatTemplate, Message, ChatTemplateOptions};
 
 use candle_nn::VarBuilder;
 use candle_transformers::generation::{LogitsProcessor, Sampling};
@@ -321,7 +321,11 @@ fn format_prompt(prompt: &str, use_chat_template: bool, enable_thinking: bool) -
     // Build system message with SmolLM3's metadata format
     let now = chrono::Local::now();
     let today_date = now.format("%d %B %Y").to_string();
-    let reasoning_mode = if enable_thinking { "/think" } else { "/no_think" };
+    let reasoning_mode = if enable_thinking {
+        "/think"
+    } else {
+        "/no_think"
+    };
 
     let system_content = format!(
         "## Metadata\n\n\
@@ -333,10 +337,7 @@ fn format_prompt(prompt: &str, use_chat_template: bool, enable_thinking: bool) -
         today_date, reasoning_mode
     );
 
-    let messages = vec![
-        Message::system(system_content),
-        Message::user(prompt),
-    ];
+    let messages = vec![Message::system(system_content), Message::user(prompt)];
 
     let options = if enable_thinking {
         ChatTemplateOptions::for_generation().with_thinking()

candle-examples/src/chat_template.rs

@@ -190,8 +190,8 @@ impl ChatTemplate {
 
     /// Load chat template from tokenizer_config.json content
     pub fn from_tokenizer_config_str(json: &str) -> Result<Self, ChatTemplateError> {
-        let config: TokenConfig = serde_json::from_str(json)
-            .map_err(|e| ChatTemplateError::ParseError(e.to_string()))?;
+        let config: TokenConfig =
+            serde_json::from_str(json).map_err(|e| ChatTemplateError::ParseError(e.to_string()))?;
 
         let template = match config.chat_template {
             Some(ChatTemplateConfig::Single(t)) => t,
@@ -202,7 +202,7 @@ impl ChatTemplate {
                     .find(|t| t.name == "default")
                     .or_else(|| templates.first())
                     .map(|t| t.template.clone())
-                    .ok_or_else(|| ChatTemplateError::NoTemplate)?
+                    .ok_or(ChatTemplateError::NoTemplate)?
             }
             None => return Err(ChatTemplateError::NoTemplate),
         };
@@ -460,10 +460,7 @@ mod tests {
     #[test]
     fn test_chatml_basic() {
         let template = ChatTemplate::chatml();
-        let messages = vec![
-            Message::system("You are helpful."),
-            Message::user("Hello"),
-        ];
+        let messages = vec![Message::system("You are helpful."), Message::user("Hello")];
 
         let result = template.apply_for_generation(&messages).unwrap();
 
@@ -493,7 +490,10 @@ mod tests {
         let messages = vec![Message::user("Think about this")];
 
         let result = template
-            .apply(&messages, &ChatTemplateOptions::for_generation().with_thinking())
+            .apply(
+                &messages,
+                &ChatTemplateOptions::for_generation().with_thinking(),
+            )
             .unwrap();
 
         assert!(result.contains("<think>"));
@@ -502,10 +502,7 @@ mod tests {
     #[test]
     fn test_llama3_format() {
         let template = ChatTemplate::llama3();
-        let messages = vec![
-            Message::system("You are helpful."),
-            Message::user("Hello"),
-        ];
+        let messages = vec![Message::system("You are helpful."), Message::user("Hello")];
 
         let result = template.apply_for_generation(&messages).unwrap();
 
@@ -529,4 +526,4 @@ mod tests {
 
         assert!(result.contains("user: test"));
     }
-}
+}

candle-transformers/src/models/smol/quantized_smollm3.rs

@@ -57,7 +57,7 @@ fn reconstruct_qk_weights(gguf_weight: &Tensor, _num_heads: usize) -> Result<Ten
         heads.push(Tensor::stack(&head_odd, 0)?);
     }
 
-    Ok(Tensor::cat(&heads, 0)?)
+    Tensor::cat(&heads, 0)
 }
 
 #[derive(Debug, Clone)]
@@ -381,7 +381,7 @@ impl QuantizedDecoderLayer {
         layer_idx: usize,
         rotary_emb: Option<Arc<RotaryEmbedding>>,
     ) -> Result<Self> {
-        let attn_vb = vb.pp(&format!("blk.{layer_idx}"));
+        let attn_vb = vb.pp(format!("blk.{layer_idx}"));
 
         Ok(Self {
             self_attn: QuantizedAttention::new(attn_vb.clone(), cfg, layer_idx, rotary_emb)?,