Merge pull request #557 from arlyon/clippy

Clippy: leftovers, codegen

.github/workflows/async-stripe.yml

@@ -50,6 +50,18 @@ jobs:
           echo "Some files changed after code generation: $CHANGED_FILES"
           exit 1
 
+  clippy-codegen:
+    runs-on: ubuntu-20.04
+    env:
+      RUSTFLAGS: -D warnings
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@v1
+        with:
+          toolchain: stable
+          components: clippy
+      - run: cargo clippy -p stripe-openapi-codegen --tests
+
   clippy:
     runs-on: ubuntu-20.04
     env:

openapi/src/codegen.rs

@@ -46,7 +46,7 @@ pub fn gen_struct(
     let obj = as_object_type(schema).expect("Expected object type");
     let schema_title = schema.schema_data.title.as_ref().unwrap_or_else(|| {
         tracing::warn!("{} has no title", object);
-        &object
+        object
     });
 
     let deleted_schema = meta.spec.component_schemas().get(&format!("deleted_{}", object));
@@ -575,7 +575,7 @@ pub fn gen_inferred_params(
                 self.starting_after = Some(item.id());
             }",
             );
-            out.push_str("}");
+            out.push('}');
         }
     }
 }
@@ -716,8 +716,8 @@ pub fn gen_variant_name(wire_name: &str, meta: &Metadata) -> String {
         "*" => "All".to_string(),
         "self" => "Self_".to_string(),
         n => {
-            if n.chars().next().unwrap().is_digit(10) {
-                format!("V{}", n.to_string().replace('-', "_").replace('.', "_"))
+            if n.chars().next().unwrap().is_ascii_digit() {
+                format!("V{}", n.to_string().replace(['-', '.'], "_"))
             } else {
                 meta.schema_to_rust_type(wire_name)
             }
@@ -1341,7 +1341,7 @@ pub fn gen_impl_requests(
         // from the spec already
         let request = meta
             .spec
-            .get_request_unwrapped(*path)
+            .get_request_unwrapped(path)
             .as_item()
             .expect("Expected item, not path reference");
         let segments = path.trim_start_matches("/v1/").split('/').collect::<Vec<_>>();

openapi/src/file_generator.rs

@@ -24,7 +24,6 @@ use crate::{
     url_finder::UrlFinder,
 };
 
-///
 #[derive(Default, Debug)]
 pub struct FileGenerator {
     pub name: String,
@@ -206,7 +205,7 @@ impl FileGenerator {
 
     pub fn add_use(&mut self, use_path: &str) {
         for path in use_path.split(',') {
-            match path.into() {
+            match path {
                 "" | "String" => {}
                 "Metadata" => {
                     self.use_params.insert("Metadata");
@@ -235,7 +234,7 @@ impl Eq for FileGenerator {}
 
 impl PartialOrd for FileGenerator {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        self.name.partial_cmp(&other.name)
+        Some(self.cmp(other))
     }
 }
 

openapi/src/main.rs

@@ -7,6 +7,7 @@ use crate::spec::Spec;
 use crate::spec_fetch::fetch_spec;
 use crate::{metadata::Metadata, url_finder::UrlFinder};
 
+#[allow(clippy::too_many_arguments)]
 mod codegen;
 mod file_generator;
 mod mappings;

openapi/src/metadata.rs

@@ -137,7 +137,7 @@ impl<'a> Metadata<'a> {
             out.push_str("}\n");
         }
 
-        write(&out_path.as_ref().join("placeholders.rs"), out.as_bytes()).unwrap();
+        write(out_path.as_ref().join("placeholders.rs"), out.as_bytes()).unwrap();
     }
 
     pub fn write_version<T>(&self, out_path: T)
@@ -151,7 +151,7 @@ impl<'a> Metadata<'a> {
             self.spec.version().replace('-', "_")
         ));
 
-        write(&out_path.as_ref().join("version.rs"), out.as_bytes()).unwrap();
+        write(out_path.as_ref().join("version.rs"), out.as_bytes()).unwrap();
     }
 
     #[tracing::instrument(skip_all)]

openapi/src/url_finder.rs

@@ -23,7 +23,7 @@ impl UrlFinder {
                 let initial_state: StripeInitialState = serde_json::from_str(
                     line.trim()
                         .trim_start_matches("window.__INITIAL_STATE__ = ")
-                        .trim_end_matches(";"),
+                        .trim_end_matches(';'),
                 )
                 .expect("should be valid json");
                 Ok(Self { url_lookup: initial_state.into() })

src/lib.rs

@@ -52,8 +52,8 @@
 //! > Want to implement your own? If it is a common strategy, please consider opening a PR to add it to the library.
 //!   Otherwise, we are open to turning this into an open trait so that you can implement your own strategy.
 
-#![allow(clippy::map_clone, clippy::large_enum_variant)]
-#![warn(clippy::unwrap_used, clippy::missing_panics_doc)]
+#![allow(clippy::large_enum_variant)]
+#![warn(clippy::missing_panics_doc)]
 #![forbid(unsafe_code)]
 // Workaround
 #![allow(ambiguous_glob_reexports)]

src/resources/checkout_session_ext.rs

@@ -55,6 +55,6 @@ impl CheckoutSession {
         id: &CheckoutSessionId,
         params: &RetrieveCheckoutSessionLineItems,
     ) -> Response<List<CheckoutSessionItem>> {
-        client.get_query(&format!("/checkout/sessions/{}/line_items", id), &params)
+        client.get_query(&format!("/checkout/sessions/{}/line_items", id), params)
     }
 }

src/resources/customer_ext.rs

@@ -7,7 +7,7 @@ use crate::resources::{
     BankAccount, Customer, PaymentMethod, PaymentSource, PaymentSourceParams, Source,
 };
 
-#[derive(Clone, Debug, Serialize, Eq, PartialEq)]
+#[derive(Clone, Debug, Serialize, Default, Eq, PartialEq)]
 pub struct CustomerPaymentMethodRetrieval<'a> {
     /// A cursor for use in pagination. `ending_before` is an object ID that defines your place in the list.
     ///For instance, if you make a list request and receive 100 objects, starting with `obj_bar`,
@@ -37,13 +37,7 @@ pub struct CustomerPaymentMethodRetrieval<'a> {
 
 impl<'a> CustomerPaymentMethodRetrieval<'a> {
     pub fn new() -> Self {
-        CustomerPaymentMethodRetrieval {
-            ending_before: None,
-            expand: &[],
-            limit: None,
-            starting_after: None,
-            type_: None,
-        }
+        CustomerPaymentMethodRetrieval::default()
     }
 }
 
@@ -83,7 +77,7 @@ pub struct CustomerSearchParams<'a> {
 
 impl<'a> CustomerSearchParams<'a> {
     pub fn new() -> CustomerSearchParams<'a> {
-        CustomerSearchParams { query: String::new(), limit: None, page: None, expand: &[] }
+        CustomerSearchParams::default()
     }
 }
 

src/resources/setup_intent_ext.rs

@@ -81,6 +81,7 @@ impl SetupIntent {
         setup_id: &SetupIntentId,
         params: VerifyMicrodeposits,
     ) -> Response<SetupIntent> {
+        #[allow(clippy::needless_borrows_for_generic_args)]
         client.post_form(&format!("/setup_intents/{}/verify_microdeposits", setup_id), &params)
     }