Remove B type param (#1751)

Co-authored-by: Jonas Platte <[email protected]>
Co-authored-by: Michael Scofield <[email protected]>

axum-macros/src/debug_handler.rs

@@ -6,14 +6,10 @@ use crate::{
 };
 use proc_macro2::{Span, TokenStream};
 use quote::{format_ident, quote, quote_spanned};
-use syn::{parse::Parse, parse_quote, spanned::Spanned, FnArg, ItemFn, Token, Type};
+use syn::{parse::Parse, spanned::Spanned, FnArg, ItemFn, Token, Type};
 
 pub(crate) fn expand(attr: Attrs, item_fn: ItemFn) -> TokenStream {
-    let Attrs { body_ty, state_ty } = attr;
-
-    let body_ty = body_ty
-        .map(second)
-        .unwrap_or_else(|| parse_quote!(axum::body::Body));
+    let Attrs { state_ty } = attr;
 
     let mut state_ty = state_ty.map(second);
 
@@ -57,7 +53,7 @@ pub(crate) fn expand(attr: Attrs, item_fn: ItemFn) -> TokenStream {
                 }
             } else {
                 let check_inputs_impls_from_request =
-                    check_inputs_impls_from_request(&item_fn, &body_ty, state_ty);
+                    check_inputs_impls_from_request(&item_fn, state_ty);
 
                 quote! {
                     #check_inputs_impls_from_request
@@ -88,20 +84,16 @@ mod kw {
 }
 
 pub(crate) struct Attrs {
-    body_ty: Option<(kw::body, Type)>,
     state_ty: Option<(kw::state, Type)>,
 }
 
 impl Parse for Attrs {
     fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
-        let mut body_ty = None;
         let mut state_ty = None;
 
         while !input.is_empty() {
             let lh = input.lookahead1();
-            if lh.peek(kw::body) {
-                parse_assignment_attribute(input, &mut body_ty)?;
-            } else if lh.peek(kw::state) {
+            if lh.peek(kw::state) {
                 parse_assignment_attribute(input, &mut state_ty)?;
             } else {
                 return Err(lh.error());
@@ -110,7 +102,7 @@ impl Parse for Attrs {
             let _ = input.parse::<Token![,]>();
         }
 
-        Ok(Self { body_ty, state_ty })
+        Ok(Self { state_ty })
     }
 }
 
@@ -183,11 +175,7 @@ fn is_self_pat_type(typed: &syn::PatType) -> bool {
     ident == "self"
 }
 
-fn check_inputs_impls_from_request(
-    item_fn: &ItemFn,
-    body_ty: &Type,
-    state_ty: Type,
-) -> TokenStream {
+fn check_inputs_impls_from_request(item_fn: &ItemFn, state_ty: Type) -> TokenStream {
     let takes_self = item_fn.sig.inputs.first().map_or(false, |arg| match arg {
         FnArg::Receiver(_) => true,
         FnArg::Typed(typed) => is_self_pat_type(typed),
@@ -266,11 +254,11 @@ fn check_inputs_impls_from_request(
                 }
             } else if consumes_request {
                 quote_spanned! {span=>
-                    #ty: ::axum::extract::FromRequest<#state_ty, #body_ty> + Send
+                    #ty: ::axum::extract::FromRequest<#state_ty> + Send
                 }
             } else {
                 quote_spanned! {span=>
-                    #ty: ::axum::extract::FromRequest<#state_ty, #body_ty, M> + Send
+                    #ty: ::axum::extract::FromRequest<#state_ty, M> + Send
                 }
             };
 
@@ -379,7 +367,6 @@ fn request_consuming_type_name(ty: &Type) -> Option<&'static str> {
 
     let type_name = match &*ident.to_string() {
         "Json" => "Json<_>",
-        "BodyStream" => "BodyStream",
         "RawBody" => "RawBody<_>",
         "RawForm" => "RawForm",
         "Multipart" => "Multipart",