From 2e067fabd3daadce8a44601c3d9cddf0e7f50655 Mon Sep 17 00:00:00 2001 From: Hugo Larcher Date: Mon, 27 Jan 2025 14:37:57 +0100 Subject: [PATCH] fix: clippy --- router/src/server.rs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/router/src/server.rs b/router/src/server.rs index e735bc75736..2781f9fbff8 100644 --- a/router/src/server.rs +++ b/router/src/server.rs @@ -1824,7 +1824,7 @@ pub async fn run( let tokenizer: Result = { use pyo3::prelude::*; - let res = Python::with_gil(|py| -> PyResult<()> { + Python::with_gil(|py| -> PyResult<()> { py_resolve_tokenizer(py, &tokenizer_name, revision.as_deref(), trust_remote_code)?; Ok(()) }) @@ -1834,12 +1834,8 @@ pub async fn run( .or_else(|err| { let out = legacy_tokenizer_handle(config_filename.as_ref()); out.ok_or(err) - }).map_err(|_|WebServerError::Tokenizer( - "Unable to load tokenizer.".to_string(), - )); - if res.is_err(){ - return res - } + }) + .map_err(|_| WebServerError::Tokenizer("Unable to load tokenizer.".to_string()))?; let filename = "out/tokenizer.json"; if let Ok(tok) = tokenizers::Tokenizer::from_file(filename) { Ok(Tokenizer::Rust(tok))