Change MSRV to 1.81

netwo-io · Sep 25, 2024 · 2a600ad · 2a600ad
1 parent 610c6d4
commit 2a600ad
Show file tree

Hide file tree

Showing 41 changed files with 88 additions and 141 deletions.
diff --git a/apistos-core/src/api_component.rs b/apistos-core/src/api_component.rs
@@ -495,7 +495,7 @@ mod test {
   use crate::ApiComponent;
 
   #[test]
-  #[allow(dead_code)]
+  #[expect(dead_code)]
   fn api_component_schema_vec_oas_3_0() {
     #[derive(JsonSchema)]
     struct TestChild {
@@ -600,7 +600,7 @@ mod test {
   }
 
   #[test]
-  #[allow(dead_code)]
+  #[expect(dead_code)]
   fn api_component_schema_vec_oas_3_1() {
     #[derive(JsonSchema)]
     struct TestChild {

diff --git a/apistos-core/src/components/custom.rs b/apistos-core/src/components/custom.rs
@@ -140,7 +140,7 @@ pub mod ipnetwork {
     use serde_json::json;
 
     #[test]
-    #[allow(dead_code)]
+    #[expect(dead_code)]
     fn ip_network_schema() {
       #[derive(JsonSchema)]
       struct Test {

diff --git a/apistos-core/src/components/multipart.rs b/apistos-core/src/components/multipart.rs
@@ -175,7 +175,7 @@ pub mod tempfile {
     use serde_json::json;
 
     #[test]
-    #[allow(dead_code)]
+    #[expect(dead_code)]
     fn multipart_tempfile_schema() {
       #[derive(JsonSchema)]
       struct Test {

diff --git a/apistos-gen-test/src/lib.rs b/apistos-gen-test/src/lib.rs
@@ -1,7 +1,3 @@
-#![allow(deprecated)]
-#![allow(dead_code)]
-#![allow(clippy::expect_used)]
-
 #[cfg(test)]
 pub(crate) mod tests;
 #[cfg(test)]

diff --git a/apistos-gen-test/src/tests/api_callback_oas_3_0.rs b/apistos-gen-test/src/tests/api_callback_oas_3_0.rs
@@ -7,7 +7,7 @@ use apistos::{JsonSchema, OpenApiVersion};
 use apistos_core::PathItemDefinition;
 use apistos_gen::{api_callback, api_operation, ApiComponent};
 
-#[allow(clippy::todo)]
+#[expect(clippy::todo)]
 mod test_models {
   use actix_web::http::header::{Header, HeaderName, HeaderValue, InvalidHeaderValue, TryIntoHeaderValue};
   use std::fmt::{Display, Formatter};
@@ -83,7 +83,6 @@ mod test_models {
 }
 
 #[test]
-#[allow(dead_code)]
 fn api_callback() {
   use actix_web::web::Header;
   use test_models::OrganizationSlug;

diff --git a/apistos-gen-test/src/tests/api_callback_oas_3_1.rs b/apistos-gen-test/src/tests/api_callback_oas_3_1.rs
@@ -7,7 +7,7 @@ use apistos::{JsonSchema, OpenApiVersion};
 use apistos_core::PathItemDefinition;
 use apistos_gen::{api_callback, api_operation, ApiComponent};
 
-#[allow(clippy::todo)]
+#[expect(clippy::todo)]
 mod test_models {
   use actix_web::http::header::{Header, HeaderName, HeaderValue, InvalidHeaderValue, TryIntoHeaderValue};
   use std::fmt::{Display, Formatter};
@@ -83,7 +83,6 @@ mod test_models {
 }
 
 #[test]
-#[allow(dead_code)]
 fn api_callback() {
   use actix_web::web::Header;
   use test_models::OrganizationSlug;

diff --git a/apistos-gen-test/src/tests/api_component_derive_oas_3_0.rs b/apistos-gen-test/src/tests/api_component_derive_oas_3_0.rs
@@ -10,7 +10,7 @@ use apistos_core::ApiComponent;
 use apistos_gen::ApiComponent;
 
 #[test]
-#[allow(dead_code)]
+#[expect(dead_code)]
 fn api_component_derive() {
   #[derive(JsonSchema, ApiComponent)]
   struct Name {
@@ -43,7 +43,7 @@ fn api_component_derive() {
 }
 
 #[test]
-#[allow(dead_code)]
+#[expect(dead_code)]
 fn api_component_derive_with_generic() {
   #[derive(JsonSchema, ApiComponent)]
   struct Name<T>
@@ -115,6 +115,7 @@ fn api_component_derive_with_generic() {
 }
 
 #[test]
+#[expect(dead_code)]
 fn api_component_derive_with_flatten() {
   #[derive(JsonSchema, ApiComponent)]
   struct Name {
@@ -165,6 +166,7 @@ fn api_component_derive_with_flatten() {
 }
 
 #[test]
+#[expect(dead_code)]
 fn api_component_derive_with_deprecated_field() {
   #[derive(JsonSchema, ApiComponent)]
   struct Name {
@@ -204,6 +206,7 @@ fn api_component_derive_with_deprecated_field() {
 }
 
 #[test]
+#[expect(dead_code)]
 fn api_component_derive_with_format() {
   #[derive(JsonSchema, ApiComponent)]
   struct Name {
@@ -242,6 +245,7 @@ fn api_component_derive_with_format() {
 }
 
 #[test]
+#[expect(dead_code)]
 fn api_component_derive_recursive() {
   #[derive(JsonSchema, ApiComponent)]
   struct Name {
@@ -724,7 +728,7 @@ fn api_component_derive_named_tagged_enums() {
   );
 }
 
-#[allow(unused_qualifications)]
+#[expect(unused_qualifications)]
 #[test]
 fn api_component_derive_named_enums_deep() {
   #[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize, ApiComponent, JsonSchema)]

diff --git a/apistos-gen-test/src/tests/api_component_derive_oas_3_1.rs b/apistos-gen-test/src/tests/api_component_derive_oas_3_1.rs
@@ -10,7 +10,7 @@ use apistos_core::ApiComponent;
 use apistos_gen::ApiComponent;
 
 #[test]
-#[allow(dead_code)]
+#[expect(dead_code)]
 fn api_component_derive() {
   #[derive(JsonSchema, ApiComponent)]
   struct Name {
@@ -44,7 +44,7 @@ fn api_component_derive() {
 }
 
 #[test]
-#[allow(dead_code)]
+#[expect(dead_code)]
 fn api_component_derive_with_generic() {
   #[derive(JsonSchema, ApiComponent)]
   struct Name<T>
@@ -117,6 +117,7 @@ fn api_component_derive_with_generic() {
 }
 
 #[test]
+#[expect(dead_code)]
 fn api_component_derive_with_flatten() {
   #[derive(JsonSchema, ApiComponent)]
   struct Name {
@@ -168,6 +169,7 @@ fn api_component_derive_with_flatten() {
 }
 
 #[test]
+#[expect(dead_code)]
 fn api_component_derive_with_deprecated_field() {
   #[derive(JsonSchema, ApiComponent)]
   struct Name {
@@ -210,6 +212,7 @@ fn api_component_derive_with_deprecated_field() {
 }
 
 #[test]
+#[expect(dead_code)]
 fn api_component_derive_with_format() {
   #[derive(JsonSchema, ApiComponent)]
   struct Name {
@@ -249,6 +252,7 @@ fn api_component_derive_with_format() {
 }
 
 #[test]
+#[expect(dead_code)]
 fn api_component_derive_recursive() {
   #[derive(JsonSchema, ApiComponent)]
   struct Name {
@@ -747,7 +751,7 @@ fn api_component_derive_named_tagged_enums() {
   );
 }
 
-#[allow(unused_qualifications)]
+#[expect(unused_qualifications)]
 #[test]
 fn api_component_derive_named_enums_deep() {
   #[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize, ApiComponent, JsonSchema)]

diff --git a/apistos-gen-test/src/tests/api_cookie_derive_oas_3_0.rs b/apistos-gen-test/src/tests/api_cookie_derive_oas_3_0.rs
@@ -8,7 +8,7 @@ use apistos_core::ApiComponent;
 use apistos_gen::ApiCookie;
 
 #[test]
-#[allow(dead_code)]
+#[expect(dead_code)]
 fn api_cookie_derive() {
   #[derive(JsonSchema, ApiCookie)]
   #[openapi_cookie(
@@ -55,7 +55,8 @@ fn api_cookie_derive() {
 }
 
 #[test]
-#[allow(dead_code)]
+#[expect(dead_code)]
+#[expect(deprecated)]
 fn api_cookie_derive_deprecated() {
   #[derive(JsonSchema, ApiCookie)]
   #[openapi_cookie(
@@ -105,7 +106,7 @@ fn api_cookie_derive_deprecated() {
 }
 
 #[test]
-#[allow(dead_code)]
+#[expect(dead_code)]
 fn api_cookie_derive_deprecated_attribute() {
   #[derive(JsonSchema, ApiCookie)]
   #[openapi_cookie(

diff --git a/apistos-gen-test/src/tests/api_cookie_derive_oas_3_1.rs b/apistos-gen-test/src/tests/api_cookie_derive_oas_3_1.rs
@@ -8,7 +8,7 @@ use apistos_core::ApiComponent;
 use apistos_gen::ApiCookie;
 
 #[test]
-#[allow(dead_code)]
+#[expect(dead_code)]
 fn api_cookie_derive() {
   #[derive(JsonSchema, ApiCookie)]
   #[openapi_cookie(
@@ -57,7 +57,8 @@ fn api_cookie_derive() {
 }
 
 #[test]
-#[allow(dead_code)]
+#[expect(dead_code)]
+#[expect(deprecated)]
 fn api_cookie_derive_deprecated() {
   #[derive(JsonSchema, ApiCookie)]
   #[openapi_cookie(
@@ -109,7 +110,7 @@ fn api_cookie_derive_deprecated() {
 }
 
 #[test]
-#[allow(dead_code)]
+#[expect(dead_code)]
 fn api_cookie_derive_deprecated_attribute() {
   #[derive(JsonSchema, ApiCookie)]
   #[openapi_cookie(

diff --git a/apistos-gen-test/src/tests/api_error_derive_oas_3_0.rs b/apistos-gen-test/src/tests/api_error_derive_oas_3_0.rs
@@ -5,7 +5,7 @@ use schemars::JsonSchema;
 use std::collections::{BTreeMap, HashSet};
 
 #[test]
-#[allow(dead_code)]
+#[expect(dead_code)]
 fn api_component_derive() {
   #[allow(clippy::duplicated_attributes)]
   #[derive(ApiErrorComponent)]
@@ -53,7 +53,7 @@ fn api_component_derive() {
 }
 
 #[test]
-#[allow(dead_code)]
+#[expect(dead_code)]
 fn api_component_with_schema() {
   #[derive(JsonSchema)]
   struct AuthorizeError {

diff --git a/apistos-gen-test/src/tests/api_error_derive_oas_3_1.rs b/apistos-gen-test/src/tests/api_error_derive_oas_3_1.rs
@@ -5,8 +5,9 @@ use schemars::JsonSchema;
 use std::collections::{BTreeMap, HashSet};
 
 #[test]
-#[allow(dead_code)]
+#[expect(dead_code)]
 fn api_component_derive() {
+  #[allow(clippy::duplicated_attributes)]
   #[derive(ApiErrorComponent)]
   #[openapi_error(
     status(code = 403),
@@ -52,14 +53,15 @@ fn api_component_derive() {
 }
 
 #[test]
-#[allow(dead_code)]
+#[expect(dead_code)]
 fn api_component_with_schema() {
   #[derive(JsonSchema)]
   struct AuthorizeError {
     reason: String,
     code: String,
   }
 
+  #[allow(clippy::duplicated_attributes)]
   #[derive(ApiErrorComponent)]
   #[openapi_error(status(code = 403), status(code = 409, description = "Too many requests"))]
   enum ErrorResponse {

diff --git a/apistos-gen-test/src/tests/api_header_derive_oas_3_0.rs b/apistos-gen-test/src/tests/api_header_derive_oas_3_0.rs
@@ -9,7 +9,7 @@ use apistos_core::ApiComponent;
 use apistos_gen::ApiHeader;
 
 #[test]
-#[allow(dead_code)]
+#[expect(dead_code)]
 fn api_header_derive() {
   #[derive(JsonSchema, ApiHeader)]
   #[openapi_header(

diff --git a/apistos-gen-test/src/tests/api_header_derive_oas_3_1.rs b/apistos-gen-test/src/tests/api_header_derive_oas_3_1.rs
@@ -9,7 +9,7 @@ use apistos_core::ApiComponent;
 use apistos_gen::ApiHeader;
 
 #[test]
-#[allow(dead_code)]
+#[expect(dead_code)]
 fn api_header_derive() {
   #[derive(JsonSchema, ApiHeader)]
   #[openapi_header(