Enable and fix extra rustc lints

Author: jplatte

crates/aide/src/axum/mod.rs

@@ -283,7 +283,7 @@ where
     /// This method accepts a transform function to edit each [`PathItem`] provided by this router.
     pub fn with_path_items(
         mut self,
-        mut transform: impl FnMut(TransformPathItem) -> TransformPathItem,
+        mut transform: impl FnMut(TransformPathItem<'_>) -> TransformPathItem<'_>,
     ) -> Self {
         for (_, item) in &mut self.paths {
             let _ = transform(TransformPathItem::new(item));
@@ -348,7 +348,7 @@ where
         mut self,
         path: &str,
         mut method_router: ApiMethodRouter<S>,
-        transform: impl FnOnce(TransformPathItem) -> TransformPathItem,
+        transform: impl FnOnce(TransformPathItem<'_>) -> TransformPathItem<'_>,
     ) -> Self {
         in_context(|ctx| {
             let mut p = method_router.take_path_item();
@@ -380,7 +380,7 @@ where
         mut self,
         path: &str,
         mut method_router: ApiMethodRouter<S>,
-        transform: impl FnOnce(TransformPathItem) -> TransformPathItem,
+        transform: impl FnOnce(TransformPathItem<'_>) -> TransformPathItem<'_>,
     ) -> Self {
         in_context(|ctx| {
             let mut p = method_router.take_path_item();
@@ -415,7 +415,7 @@ where
     #[tracing::instrument(skip_all)]
     pub fn finish_api_with<F>(mut self, api: &mut OpenApi, transform: F) -> Router<S>
     where
-        F: FnOnce(TransformOpenApi) -> TransformOpenApi,
+        F: FnOnce(TransformOpenApi<'_>) -> TransformOpenApi<'_>,
     {
         self.merge_api_with(api, transform);
         self.router
@@ -427,7 +427,7 @@ where
 
     fn merge_api_with<F>(&mut self, api: &mut OpenApi, transform: F)
     where
-        F: FnOnce(TransformOpenApi) -> TransformOpenApi,
+        F: FnOnce(TransformOpenApi<'_>) -> TransformOpenApi<'_>,
     {
         if api.paths.is_none() {
             api.paths = Some(Default::default());
@@ -498,7 +498,7 @@ where
         mut self,
         path: &str,
         docs: routing::ApiMethodDocs,
-        transform: impl FnOnce(TransformPathItem) -> TransformPathItem,
+        transform: impl FnOnce(TransformPathItem<'_>) -> TransformPathItem<'_>,
     ) -> Self {
         in_context(|ctx| {
             let mut path_item = if let Some(existing) = self.paths.get_mut(path) {

crates/aide/src/axum/routing/mod.rs

@@ -136,7 +136,7 @@ macro_rules! method_router_chain_method {
             I: OperationInput,
             O: OperationOutput,
             T: 'static,
-            F: FnOnce(TransformOperation) -> TransformOperation,
+            F: FnOnce(TransformOperation<'_>) -> TransformOperation<'_>,
         {
             let mut operation = Operation::default();
             in_context(|ctx| {
@@ -199,7 +199,7 @@ macro_rules! method_router_top_level {
             O: OperationOutput,
             S: Clone + Send + Sync + 'static,
             T: 'static,
-            F: FnOnce(TransformOperation) -> TransformOperation,
+            F: FnOnce(TransformOperation<'_>) -> TransformOperation<'_>,
         {
             let mut router = ApiMethodRouter::from(routing::$name(handler));
             let mut operation = Operation::default();

crates/aide/src/helpers/mod.rs

@@ -1,3 +1,3 @@
-pub mod no_api;
-pub mod use_api;
-pub mod with_api;
+pub(crate) mod no_api;
+pub(crate) mod use_api;
+pub(crate) mod with_api;

crates/aide/src/lib.rs

@@ -114,7 +114,7 @@
 //! it might support older versions but without guarantees.
 //!
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
-#![warn(clippy::pedantic, missing_docs)]
+#![warn(clippy::pedantic, missing_docs, unreachable_pub, rust_2018_idioms)]
 #![allow(
     clippy::default_trait_access,
     clippy::doc_markdown,

crates/aide/src/openapi/openapi.rs

@@ -102,11 +102,16 @@ mod serde_version {
 
     use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
-    pub fn serialize<S: Serializer>(_: &Cow<'static, str>, ser: S) -> Result<S::Ok, S::Error> {
+    pub(super) fn serialize<S: Serializer>(
+        _: &Cow<'static, str>,
+        ser: S,
+    ) -> Result<S::Ok, S::Error> {
         Cow::Borrowed("3.1.0").serialize(ser)
     }
 
-    pub fn deserialize<'de, D: Deserializer<'de>>(de: D) -> Result<Cow<'static, str>, D::Error> {
+    pub(super) fn deserialize<'de, D: Deserializer<'de>>(
+        de: D,
+    ) -> Result<Cow<'static, str>, D::Error> {
         <&'de str>::deserialize(de).and_then(|s| match s == "3.1.0" {
             true => Ok(Cow::Owned("3.1.0".to_owned())),
             false => Err(serde::de::Error::custom("expected 3.1.0")),

crates/aide/src/openapi/paths.rs

@@ -164,7 +164,7 @@ pub struct Paths {
 
 impl Paths {
     /// Iterate over path items.
-    pub fn iter(&self) -> indexmap::map::Iter<String, ReferenceOr<PathItem>> {
+    pub fn iter(&self) -> indexmap::map::Iter<'_, String, ReferenceOr<PathItem>> {
         self.paths.iter()
     }
 }

crates/aide/src/openapi/status_code.rs

@@ -28,7 +28,7 @@ impl<'de> Deserialize<'de> for StatusCode {
         impl<'de> Visitor<'de> for StatusCodeVisitor {
             type Value = StatusCode;
 
-            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+            fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
                 formatter.write_str("number between 100 and 999 (as string or integer) or a string that matches `\\dXX`")
             }
 

crates/aide/src/transform.rs

@@ -175,7 +175,7 @@ impl<'t> TransformOpenApi<'t> {
     pub fn default_response_with<R, F>(self, transform: F) -> Self
     where
         R: OperationOutput,
-        F: Fn(TransformResponse<R::Inner>) -> TransformResponse<R::Inner> + Clone,
+        F: Fn(TransformResponse<'_, R::Inner>) -> TransformResponse<'_, R::Inner> + Clone,
     {
         if let Some(p) = &mut self.api.paths {
             for (_, p) in &mut p.paths {
@@ -393,7 +393,7 @@ impl<'t> TransformPathItem<'t> {
     pub fn default_response_with<R, F>(self, transform: F) -> Self
     where
         R: OperationOutput,
-        F: Fn(TransformResponse<R::Inner>) -> TransformResponse<R::Inner> + Clone,
+        F: Fn(TransformResponse<'_, R::Inner>) -> TransformResponse<'_, R::Inner> + Clone,
     {
         in_context(|ctx| ctx.show_error = filter_no_duplicate_response);
 
@@ -558,7 +558,7 @@ impl<'t> TransformOperation<'t> {
     pub fn parameter<T, F>(self, name: &str, transform: F) -> Self
     where
         T: Serialize,
-        F: FnOnce(TransformParameter<T>) -> TransformParameter<T>,
+        F: FnOnce(TransformParameter<'_, T>) -> TransformParameter<'_, T>,
     {
         let (idx, param) = match self
             .operation
@@ -601,7 +601,7 @@ impl<'t> TransformOperation<'t> {
     #[tracing::instrument(skip_all, fields(operation_id = self.operation.operation_id))]
     pub fn parameter_untyped<F>(self, name: &str, transform: F) -> Self
     where
-        F: FnOnce(TransformParameter<()>) -> TransformParameter<()>,
+        F: FnOnce(TransformParameter<'_, ()>) -> TransformParameter<'_, ()>,
     {
         self.parameter(name, transform)
     }
@@ -644,7 +644,7 @@ impl<'t> TransformOperation<'t> {
     pub fn default_response_with<R, F>(self, transform: F) -> Self
     where
         R: OperationOutput,
-        F: FnOnce(TransformResponse<R::Inner>) -> TransformResponse<R::Inner>,
+        F: FnOnce(TransformResponse<'_, R::Inner>) -> TransformResponse<'_, R::Inner>,
     {
         in_context(|ctx| {
             if let Some(mut res) = R::operation_response(ctx, self.operation) {
@@ -707,7 +707,7 @@ impl<'t> TransformOperation<'t> {
     pub fn response_with<const N: u16, R, F>(self, transform: F) -> Self
     where
         R: OperationOutput,
-        F: FnOnce(TransformResponse<R::Inner>) -> TransformResponse<R::Inner>,
+        F: FnOnce(TransformResponse<'_, R::Inner>) -> TransformResponse<'_, R::Inner>,
     {
         if self.operation.responses.is_none() {
             self.operation.responses = Some(Default::default());
@@ -777,7 +777,7 @@ impl<'t> TransformOperation<'t> {
     pub fn response_range_with<const N: u16, R, F>(self, transform: F) -> Self
     where
         R: OperationOutput,
-        F: FnOnce(TransformResponse<R::Inner>) -> TransformResponse<R::Inner>,
+        F: FnOnce(TransformResponse<'_, R::Inner>) -> TransformResponse<'_, R::Inner>,
     {
         if self.operation.responses.is_none() {
             self.operation.responses = Some(Default::default());
@@ -812,7 +812,7 @@ impl<'t> TransformOperation<'t> {
         self,
         callback_name: &str,
         callback_url: &str,
-        callback_transform: impl FnOnce(TransformCallback) -> TransformCallback,
+        callback_transform: impl FnOnce(TransformCallback<'_>) -> TransformCallback<'_>,
     ) -> Self {
         let callbacks = self
             .operation
@@ -1115,7 +1115,10 @@ impl<'t> TransformCallback<'t> {
 
     /// Add a "delete" callback operation.
     #[allow(clippy::missing_panics_doc)]
-    pub fn delete(self, operation: impl FnOnce(TransformOperation) -> TransformOperation) -> Self {
+    pub fn delete(
+        self,
+        operation: impl FnOnce(TransformOperation<'_>) -> TransformOperation<'_>,
+    ) -> Self {
         let op = match &mut self.path.delete {
             Some(op) => op,
             None => {
@@ -1135,7 +1138,10 @@ impl<'t> TransformCallback<'t> {
 
     /// Add a "get" callback operation.
     #[allow(clippy::missing_panics_doc)]
-    pub fn get(self, operation: impl FnOnce(TransformOperation) -> TransformOperation) -> Self {
+    pub fn get(
+        self,
+        operation: impl FnOnce(TransformOperation<'_>) -> TransformOperation<'_>,
+    ) -> Self {
         let op = match &mut self.path.get {
             Some(op) => op,
             None => {
@@ -1155,7 +1161,10 @@ impl<'t> TransformCallback<'t> {
 
     /// Add a "head" callback operation.
     #[allow(clippy::missing_panics_doc)]
-    pub fn head(self, operation: impl FnOnce(TransformOperation) -> TransformOperation) -> Self {
+    pub fn head(
+        self,
+        operation: impl FnOnce(TransformOperation<'_>) -> TransformOperation<'_>,
+    ) -> Self {
         let op = match &mut self.path.head {
             Some(op) => op,
             None => {
@@ -1175,7 +1184,10 @@ impl<'t> TransformCallback<'t> {
 
     /// Add a "options" callback operation.
     #[allow(clippy::missing_panics_doc)]
-    pub fn options(self, operation: impl FnOnce(TransformOperation) -> TransformOperation) -> Self {
+    pub fn options(
+        self,
+        operation: impl FnOnce(TransformOperation<'_>) -> TransformOperation<'_>,
+    ) -> Self {
         let op = match &mut self.path.options {
             Some(op) => op,
             None => {
@@ -1195,7 +1207,10 @@ impl<'t> TransformCallback<'t> {
 
     /// Add a "patch" callback operation.
     #[allow(clippy::missing_panics_doc)]
-    pub fn patch(self, operation: impl FnOnce(TransformOperation) -> TransformOperation) -> Self {
+    pub fn patch(
+        self,
+        operation: impl FnOnce(TransformOperation<'_>) -> TransformOperation<'_>,
+    ) -> Self {
         let op = match &mut self.path.patch {
             Some(op) => op,
             None => {
@@ -1215,7 +1230,10 @@ impl<'t> TransformCallback<'t> {
 
     /// Add a "post" callback operation.
     #[allow(clippy::missing_panics_doc)]
-    pub fn post(self, operation: impl FnOnce(TransformOperation) -> TransformOperation) -> Self {
+    pub fn post(
+        self,
+        operation: impl FnOnce(TransformOperation<'_>) -> TransformOperation<'_>,
+    ) -> Self {
         let op = match &mut self.path.post {
             Some(op) => op,
             None => {
@@ -1235,7 +1253,10 @@ impl<'t> TransformCallback<'t> {
 
     /// Add a "put" callback operation.
     #[allow(clippy::missing_panics_doc)]
-    pub fn put(self, operation: impl FnOnce(TransformOperation) -> TransformOperation) -> Self {
+    pub fn put(
+        self,
+        operation: impl FnOnce(TransformOperation<'_>) -> TransformOperation<'_>,
+    ) -> Self {
         let op = match &mut self.path.put {
             Some(op) => op,
             None => {
@@ -1255,7 +1276,10 @@ impl<'t> TransformCallback<'t> {
 
     /// Add a "trace" callback operation.
     #[allow(clippy::missing_panics_doc)]
-    pub fn trace(self, operation: impl FnOnce(TransformOperation) -> TransformOperation) -> Self {
+    pub fn trace(
+        self,
+        operation: impl FnOnce(TransformOperation<'_>) -> TransformOperation<'_>,
+    ) -> Self {
         let op = match &mut self.path.trace {
             Some(op) => op,
             None => {
@@ -1274,7 +1298,10 @@ impl<'t> TransformCallback<'t> {
     }
 
     /// Apply an another transform function.
-    pub fn path(mut self, transform: impl FnOnce(TransformPathItem) -> TransformPathItem) -> Self {
+    pub fn path(
+        mut self,
+        transform: impl FnOnce(TransformPathItem<'_>) -> TransformPathItem<'_>,
+    ) -> Self {
         let t = transform(TransformPathItem::new(self.path));
 
         if t.hidden {

crates/aide/src/util.rs

@@ -184,7 +184,7 @@ mod spec {
     {
         type Value = IndexMap<K, V>;
 
-        fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+        fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
             formatter.write_str("a map whose fields obey a predicate")
         }