Ensure disambiguation for default call

Author: ohsayan

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All changes to this project will be noted in this file.
 
+## Version 0.1.3
+
+Internal fixes for `default` calls
+
 ## Version 0.1.2
 
 Fixed docstrings

README.md

@@ -13,11 +13,18 @@ bagel = "0.1"
 
 ## What bagel can do
 
-- `Ctor`: Derive constructors
-- `Gtor`: Derive getters
-- `Stor`: Derive setters
-- `Constdef`: Derive constant, compile-time default implementations
 - `def`: Use the [default declaration syntax](#default-declaration-syntax)
+- `Ctor`: Derive constructors:
+  - Full lifetimes, generics and where clause support
+  - `#[phantom]`: Auto elide `PhantomData` fields
+  - `#[ctor_const]`: Make the constructor a `const fn`
+- `Gtor`: Derive getters:
+  - Full lifetimes, generics and where clause support
+  - Advanced attributes: `#[gtor_const]`, `#[gtor_copy]`, `#[gtor_skip]`, `#[phantom]` and `#[gtor]`
+- `Stor`: Derive setters
+  - Full lifetimes, generics and where clause support
+  - Skip setter with `#[stor_skip]` or `#[phantom]`
+- `Constdef`: Derive constant, compile-time default implementations. See [an example here](#constdef-example)
 
 ## Default declaration syntax
 
@@ -65,6 +72,29 @@ assert_eq!(myoven.items_to_bake[3], "pie");
 assert_eq!(myoven.people_buffer.len(), 2);
 ```
 
+## `Constdef` example
+
+```rust
+use bagel::Constdef;
+
+#[derive(Constdef)]
+struct Port {
+    requests: usize,
+    admin: bool,
+}
+
+#[derive(Constdef)]
+struct PortLogger {
+    ports: [Port; 65536],
+    root_pid: usize,
+}
+
+const PORT_LOGGER: PortLogger = PortLogger::default();
+
+assert_eq!(PORT_LOGGER.ports[0].requests, 0);
+assert_eq!(PORT_LOGGER.ports[65535].admin, false);
+```
+
 ## License
 
 The `dough` and `bagel` libraries are distributed under the [Apache-2.0 License](./LICENSE).

bagel/Cargo.toml

@@ -7,7 +7,7 @@ license = "Apache-2.0"
 name = "bagel"
 readme = "../README.md"
 repository = "https://github.com/skytable/bagel"
-version = "0.1.2"
+version = "0.1.3"
 
 [dependencies]
-dough = "0.1.1"
+dough = "0.1.3"

bagel/tests/all.rs

@@ -0,0 +1,22 @@
+use bagel::Constdef;
+
+#[derive(Constdef)]
+struct Port {
+    requests: usize,
+    admin: bool,
+}
+
+#[derive(Constdef)]
+struct PortLogger {
+    ports: [Port; 65536],
+    root_pid: usize,
+}
+
+const PORT_LOGGER: PortLogger = PortLogger::default();
+
+#[test]
+fn nested_object() {
+    assert_eq!(PORT_LOGGER.ports[0].requests, 0);
+    assert_eq!(PORT_LOGGER.ports[65535].admin, false);
+    assert_eq!(PORT_LOGGER.root_pid, 0);
+}

dough/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dough"
-version = "0.1.1"
+version = "0.1.3"
 edition = "2018"
 license = "Apache-2.0"
 description = "Internal macros for the bagel crate"

dough/src/constdef/mod.rs

@@ -60,11 +60,11 @@ fn generate_unnamed(fields: Vec<UnnamedFieldInfo<'_>>, ast: &DeriveInput) -> Tok
         }
         impl #impl_gen ::core::default::Default for #struct_name #ty_gen #where_clause {
             fn default() -> Self {
-                Self::default()
+                ::bagel::Constdef::DEFAULT
             }
         }
         impl #impl_gen ::bagel::Constdef for #struct_name #ty_gen #where_clause {
-            const DEFAULT: Self = Self::default();
+            const DEFAULT: Self = #struct_name::default();
         }
     };
     tokens.into()
@@ -116,11 +116,11 @@ fn generate_named(fields: Vec<NamedFieldInfo<'_>>, ast: &DeriveInput) -> TokenSt
         }
         impl #impl_gen ::core::default::Default for #struct_name #ty_gen #where_clause {
             fn default() -> Self {
-                Self::default()
+                ::bagel::Constdef::DEFAULT
             }
         }
         impl #impl_gen ::bagel::Constdef for #struct_name #ty_gen #where_clause {
-            const DEFAULT: Self = Self::default();
+            const DEFAULT: Self = #struct_name::default();
         }
     };
     tokens.into()

dough/src/lib.rs

@@ -1,7 +1,9 @@
 //! # `dough`
 //!
 //! Consider using the [`bagel`](https://crates.io/crates/bagel) crate. The `dough` crate provides
-//! supporting macros for bagel
+//! supporting macros for bagel.
+//!
+//! WARNING: Do not rely on the API of this crate
 //!
 
 use proc_macro::TokenStream;