Allow fully-qualified derives

Adding a custom derive like "serde::Deserialize" results in a panic complaining that it is not a valid Ident. Derive params are not identifiers, so treat it as a token stream instead.
rust-lang · Feb 18, 2022 · b3e6a98 · b3e6a98
1 parent 71fe5fd
commit b3e6a98
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bindgen-integration/build.rs b/bindgen-integration/build.rs
@@ -128,7 +128,7 @@ impl ParseCallbacks for MacroCallback {
             ]
         } else if name == "MyOrderedEnum" {
             vec![
-                "PartialOrd".into(),
+                "std::cmp::PartialOrd".into(),
             ]
         } else {
             vec![]

diff --git a/src/codegen/helpers.rs b/src/codegen/helpers.rs
@@ -30,7 +30,7 @@ pub mod attributes {
         let which_ones = which_ones
             .iter()
             .cloned()
-            .map(|one| Ident::new(one, Span::call_site()));
+            .map(|one| TokenStream::from_str(one).expect("derive to be valid"));
         quote! {
             #[derive( #( #which_ones ),* )]
         }