From 688195395301556bc30ad1778359e22ec3caf714 Mon Sep 17 00:00:00 2001 From: Kalvin C Date: Thu, 20 Feb 2025 09:59:13 -0800 Subject: [PATCH] style: use is_none_or instead of map_or per clippy warnings rust >= 1.85.0 (#1314) --- crates/goose/src/providers/formats/openai.rs | 2 +- crates/mcp-server/src/router.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/goose/src/providers/formats/openai.rs b/crates/goose/src/providers/formats/openai.rs index 512bffbe60..32186c796b 100644 --- a/crates/goose/src/providers/formats/openai.rs +++ b/crates/goose/src/providers/formats/openai.rs @@ -289,7 +289,7 @@ fn ensure_valid_json_schema(schema: &mut Value) { let is_object_type = params_obj .get("type") .and_then(|t| t.as_str()) - .map_or(true, |t| t == "object"); // Default to true if no type is specified + .is_none_or(|t| t == "object"); // Default to true if no type is specified // Only apply full schema validation to object types if is_object_type { diff --git a/crates/mcp-server/src/router.rs b/crates/mcp-server/src/router.rs index 51815b7dd8..d2918311cc 100644 --- a/crates/mcp-server/src/router.rs +++ b/crates/mcp-server/src/router.rs @@ -311,7 +311,7 @@ pub trait Router: Send + Sync + 'static { || arguments .get(&arg.name) .and_then(Value::as_str) - .map_or(true, str::is_empty)) + .is_none_or(str::is_empty)) { return Err(RouterError::InvalidParams(format!( "Missing required argument: '{}'",