diff --git a/meilisearch-http/tests/common/encoder.rs b/meilisearch-http/tests/common/encoder.rs index 44a59d39b..2363ec4f9 100644 --- a/meilisearch-http/tests/common/encoder.rs +++ b/meilisearch-http/tests/common/encoder.rs @@ -1,9 +1,9 @@ use actix_http::header::TryIntoHeaderPair; use bytes::Bytes; +use flate2::read::{GzDecoder, ZlibDecoder}; use flate2::write::{GzEncoder, ZlibEncoder}; use flate2::Compression; use std::io::{Read, Write}; -use flate2::read::{GzDecoder, ZlibDecoder}; #[derive(Clone, Copy)] pub enum Encoder { @@ -50,22 +50,22 @@ impl Encoder { GzDecoder::new(input.as_ref()) .read_to_end(&mut buffer) .expect("Invalid gzip stream"); - }, + } Self::Deflate => { ZlibDecoder::new(input.as_ref()) .read_to_end(&mut buffer) .expect("Invalid zlib stream"); - }, + } Self::Plain => { buffer - .write(input.as_ref()) - .expect("Unexpected memory copying issue"); - }, + .write_all(input.as_ref()) + .expect("Unexpected memory copying issue"); + } Self::Brotli => { - brotli::Decompressor::new(input.as_ref(), 4096 ) + brotli::Decompressor::new(input.as_ref(), 4096) .read_to_end(&mut buffer) .expect("Invalid brotli stream"); - }, + } }; buffer } diff --git a/meilisearch-http/tests/documents/get_documents.rs b/meilisearch-http/tests/documents/get_documents.rs index cd25dd57c..f3a25e720 100644 --- a/meilisearch-http/tests/documents/get_documents.rs +++ b/meilisearch-http/tests/documents/get_documents.rs @@ -174,13 +174,10 @@ async fn get_all_documents_no_options_with_response_compression() { server.service.options, analytics::MockAnalytics::new(&server.service.options).0 )) - .await; + .await; let req = test::TestRequest::get() - .uri(&format!( - "/indexes/{}/documents?", - urlencode(index_uid.as_ref()) - )) + .uri(&format!("/indexes/{}/documents?", urlencode(index_uid))) .insert_header((ACCEPT_ENCODING, "gzip")) .to_request(); @@ -191,7 +188,7 @@ async fn get_all_documents_no_options_with_response_compression() { let bytes = test::read_body(res).await; let decoded = Encoder::Gzip.decode(bytes); let parsed_response = - serde_json::from_slice::(&decoded.into().as_ref()).expect("Expecting valid json"); + serde_json::from_slice::(decoded.into().as_ref()).expect("Expecting valid json"); let arr = parsed_response["results"].as_array().unwrap(); assert_eq!(arr.len(), 20); diff --git a/meilisearch-http/tests/index/create_index.rs b/meilisearch-http/tests/index/create_index.rs index f3f0949f6..30040abfe 100644 --- a/meilisearch-http/tests/index/create_index.rs +++ b/meilisearch-http/tests/index/create_index.rs @@ -72,7 +72,7 @@ async fn create_index_with_gzip_encoded_request_and_receiving_brotli_encoded_res let bytes = test::read_body(res).await; let decoded = Encoder::Brotli.decode(bytes); let parsed_response = - serde_json::from_slice::(&decoded.into().as_ref()).expect("Expecting valid json"); + serde_json::from_slice::(decoded.into().as_ref()).expect("Expecting valid json"); assert_eq!(parsed_response["taskUid"], 0); assert_eq!(parsed_response["indexUid"], "test");