fix(derive): allow derive(Arbitrary) for struct Option

Use the full path to `core::option::Option` and `core::default::Default` in the generated code. This allows `derive(Arbitrary)` on structs named `Option` or `Default`.
rust-fuzz · Sep 10, 2024 · aa899f9 · aa899f9
1 parent 915848a
commit aa899f9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/derive/src/lib.rs b/derive/src/lib.rs
@@ -341,7 +341,7 @@ fn construct(
 fn construct_take_rest(fields: &Fields) -> Result<TokenStream> {
     construct(fields, |idx, field| {
         determine_field_constructor(field).map(|field_constructor| match field_constructor {
-            FieldConstructor::Default => quote!(Default::default()),
+            FieldConstructor::Default => quote!(::core::default::Default::default()),
             FieldConstructor::Arbitrary => {
                 if idx + 1 == fields.len() {
                     quote! { arbitrary::Arbitrary::arbitrary_take_rest(u)? }
@@ -392,7 +392,7 @@ fn gen_size_hint_method(input: &DeriveInput) -> Result<TokenStream> {
         size_hint_fields(fields).map(|hint| {
             quote! {
                 #[inline]
-                fn size_hint(depth: usize) -> (usize, Option<usize>) {
+                fn size_hint(depth: usize) -> (usize, ::core::option::Option<usize>) {
                     arbitrary::size_hint::recursion_guard(depth, |depth| #hint)
                 }
             }
@@ -414,7 +414,7 @@ fn gen_size_hint_method(input: &DeriveInput) -> Result<TokenStream> {
             .map(|variants| {
                 quote! {
                     #[inline]
-                    fn size_hint(depth: usize) -> (usize, Option<usize>) {
+                    fn size_hint(depth: usize) -> (usize, ::core::option::Option<usize>) {
                         arbitrary::size_hint::and(
                             <u32 as arbitrary::Arbitrary>::size_hint(depth),
                             arbitrary::size_hint::recursion_guard(depth, |depth| {
@@ -429,7 +429,7 @@ fn gen_size_hint_method(input: &DeriveInput) -> Result<TokenStream> {
 
 fn gen_constructor_for_field(field: &Field) -> Result<TokenStream> {
     let ctor = match determine_field_constructor(field)? {
-        FieldConstructor::Default => quote!(Default::default()),
+        FieldConstructor::Default => quote!(::core::default::Default::default()),
         FieldConstructor::Arbitrary => quote!(arbitrary::Arbitrary::arbitrary(u)?),
         FieldConstructor::With(function_or_closure) => quote!((#function_or_closure)(u)?),
         FieldConstructor::Value(value) => quote!(#value),

diff --git a/tests/derive.rs b/tests/derive.rs
@@ -300,3 +300,20 @@ fn test_field_attributes() {
     // 17 is the 3rd byte used by arbitrary
     assert_eq!(parcel.price, 17);
 }
+
+#[test]
+fn derive_structs_named_same_as_core() {
+    #[derive(Debug, Arbitrary)]
+    struct Option {
+        f: core::option::Option<u32>,
+    }
+
+    let _ = Option::arbitrary(&mut Unstructured::new(&[]));
+
+    #[derive(Debug, Default, Arbitrary)]
+    struct Default {
+        f: u32,
+    }
+
+    let _ = Default::arbitrary(&mut Unstructured::new(&[]));
+}