From 764df24b7d6ff98cbf9ca77fa103acb9cc69ff25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Thu, 9 Feb 2023 13:21:20 +0100 Subject: [PATCH] Make clippy happy (again) --- meilisearch-auth/src/lib.rs | 3 +-- meilisearch/tests/auth/authorization.rs | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/meilisearch-auth/src/lib.rs b/meilisearch-auth/src/lib.rs index c27b71e74..9f9b15f38 100644 --- a/meilisearch-auth/src/lib.rs +++ b/meilisearch-auth/src/lib.rs @@ -214,8 +214,7 @@ impl SearchRules { map.iter() .filter(|(pattern, _)| pattern.matches_str(index)) .max_by_key(|(pattern, _)| (pattern.is_exact(), pattern.len())) - .map(|(_, rule)| rule.clone()) - .flatten() + .and_then(|(_, rule)| rule.clone()) } } } diff --git a/meilisearch/tests/auth/authorization.rs b/meilisearch/tests/auth/authorization.rs index 15d4d96fb..69a74b022 100644 --- a/meilisearch/tests/auth/authorization.rs +++ b/meilisearch/tests/auth/authorization.rs @@ -445,7 +445,7 @@ async fn access_authorized_index_patterns() { // use created key. let key = response["key"].as_str().unwrap(); - server.use_api_key(&key); + server.use_api_key(key); // refer to products_1 and products with modified api key. let index_1 = server.index("products_1"); @@ -515,7 +515,7 @@ async fn raise_error_non_authorized_index_patterns() { // use created key. let key = response["key"].as_str().unwrap(); - server.use_api_key(&key); + server.use_api_key(key); // refer to products_1 and products_2 with modified api key. let product_1_index = server.index("products_1"); @@ -582,7 +582,7 @@ async fn pattern_indexes() { let (response, code) = server.add_api_key(content).await; assert_eq!(201, code, "{:?}", &response); let key = response["key"].as_str().expect("Key is not string"); - server.use_api_key(&key); + server.use_api_key(key); // Create Index products_1 using generated api key let products_1 = server.index("products_1"); @@ -859,7 +859,7 @@ async fn lazy_create_index_from_pattern() { // use created key. let key = response["key"].as_str().unwrap(); - server.use_api_key(&key); + server.use_api_key(key); // try to create a index via add documents route let index = server.index("products_1");