Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use staged_builder #349

Merged
merged 3 commits into from
May 1, 2024
Merged

Use staged_builder #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01c590b
Use staged_builder
sfackler Apr 23, 2024
5fa8418
Add generated changelog entries
svc-changelog Apr 23, 2024
ec387ad
Avoid empty builder attrs
sfackler Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions changelog/@unreleased/pr-349.v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
type: break
break:
description: Object builders are now generated with `#[staged_builder]`. Constructors
now ignore optional fields.
links:
- https://github.com/palantir/conjure-rust/pull/349
275 changes: 85 additions & 190 deletions conjure-codegen/src/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,15 +390,6 @@ impl Context {
}
}

#[allow(clippy::only_used_in_recursion)]
pub fn option_inner_type<'a>(&self, def: &'a Type) -> Option<&'a Type> {
match def {
Type::Optional(def) => Some(def.item_type()),
Type::External(def) => self.option_inner_type(def.fallback()),
_ => None,
}
}

pub fn borrowed_rust_type(&self, this_type: &TypeName, def: &Type) -> TokenStream {
match def {
Type::Primitive(def) => match *def {
Expand Down Expand Up @@ -501,201 +492,117 @@ impl Context {
}
}

pub fn setter_bounds(
&self,
this_type: &TypeName,
def: &Type,
value_ident: TokenStream,
) -> SetterBounds {
pub fn builder_config(&self, this_type: &TypeName, def: &Type) -> BuilderConfig {
match def {
Type::Primitive(primitive) => match *primitive {
PrimitiveType::String => {
let into = self.into_ident(this_type);
let string = self.string_ident(this_type);
SetterBounds::Generic {
argument_bound: quote!(#into<#string>),
assign_rhs: quote!(#value_ident.into()),
}
}
PrimitiveType::Binary => {
let into = self.into_ident(this_type);
SetterBounds::Generic {
argument_bound: quote!(#into<conjure_object::Bytes>),
assign_rhs: quote!(#value_ident.into()),
}
}
PrimitiveType::Any => SetterBounds::Generic {
argument_bound: quote!(conjure_object::serde::Serialize),
assign_rhs: quote! {
conjure_object::Any::new(#value_ident).expect("value failed to serialize")
},
},
_ => SetterBounds::Simple {
argument_type: self.rust_type(this_type, def),
assign_rhs: quote!(#value_ident),
Type::Primitive(def) => match def {
PrimitiveType::String | PrimitiveType::Binary => BuilderConfig::Into,
PrimitiveType::Any => BuilderConfig::Custom {
type_: quote!(impl conjure_object::serde::Serialize),
convert: quote!(
|v| conjure_object::Any::new(v).expect("value failed to serialize")
),
},
_ => BuilderConfig::Normal,
},
Type::Optional(def) => {
let into = self.into_ident(this_type);
let option = self.option_ident(this_type);
let item_type = self.rust_type(this_type, def.item_type());
let assign_rhs = if self.needs_box(def.item_type()) {
if self.needs_box(def.item_type()) {
let into = self.into_ident(this_type);
let option = self.option_ident(this_type);
let item_type = self.rust_type(this_type, def.item_type());
let box_ = self.box_ident(this_type);
quote!(#value_ident.into().map(#box_::new))
BuilderConfig::Custom {
type_: quote!(impl #into<#option<#item_type>>),
convert: quote!(|v| v.into().map(#box_::new)),
}
} else {
quote!(#value_ident.into())
};

SetterBounds::Generic {
argument_bound: quote!(#into<#option<#item_type>>),
assign_rhs,
}
}
Type::List(def) => {
let into_iterator = self.into_iterator_ident(this_type);
let item_type = self.rust_type(this_type, def.item_type());
SetterBounds::Collection {
argument_bound: quote!(#into_iterator<Item = #item_type>),
type_: CollectionType::List {
value: self.collection_setter_bounds(
this_type,
def.item_type(),
quote!(value),
false,
),
},
}
}
Type::Set(def) => {
let into_iterator = self.into_iterator_ident(this_type);
let item_type = self.rust_type_inner(this_type, def.item_type(), true);
SetterBounds::Collection {
argument_bound: quote!(#into_iterator<Item = #item_type>),
type_: CollectionType::Set {
value: self.collection_setter_bounds(
this_type,
def.item_type(),
quote!(value),
true,
),
},
}
}
Type::Map(def) => {
let into_iterator = self.into_iterator_ident(this_type);
let key_type = self.rust_type_inner(this_type, def.key_type(), true);
let value_type = self.rust_type(this_type, def.value_type());
SetterBounds::Collection {
argument_bound: quote!(#into_iterator<Item = (#key_type, #value_type)>),
type_: CollectionType::Map {
key: self.collection_setter_bounds(
this_type,
def.key_type(),
quote!(key),
true,
),
value: self.collection_setter_bounds(
this_type,
def.value_type(),
quote!(value),
false,
),
},
BuilderConfig::Into
}
}
Type::List(def) => BuilderConfig::List {
item: self.builder_item_config(this_type, def.item_type(), false),
},
Type::Set(def) => BuilderConfig::Set {
item: self.builder_item_config(this_type, def.item_type(), true),
},
Type::Map(def) => BuilderConfig::Map {
key: self.builder_item_config(this_type, def.key_type(), true),
value: self.builder_item_config(this_type, def.value_type(), false),
},
Type::Reference(def) => {
let argument_type = self.type_path(this_type, def);
let mut assign_rhs = value_ident;
if self.ref_needs_box(def) {
let box_ = self.box_ident(this_type);
assign_rhs = quote!(#box_::new(#assign_rhs));
}

SetterBounds::Simple {
argument_type,
assign_rhs,
BuilderConfig::Custom {
type_: self.type_path(this_type, def),
convert: quote!(#box_::new),
}
} else {
BuilderConfig::Normal
}
}
Type::External(def) => self.setter_bounds(this_type, def.fallback(), value_ident),
Type::External(def) => self.builder_config(this_type, def.fallback()),
}
}

fn collection_setter_bounds(
fn builder_item_config(
&self,
this_type: &TypeName,
def: &Type,
value_ident: TokenStream,
key: bool,
) -> CollectionSetterBounds {
) -> BuilderItemConfig {
match def {
Type::Primitive(primitive) => match *primitive {
PrimitiveType::String => {
let into = self.into_ident(this_type);
let string = self.string_ident(this_type);
CollectionSetterBounds::Generic {
argument_bound: quote!(#into<#string>),
assign_rhs: quote!(#value_ident.into()),
}
}
PrimitiveType::Binary => {
let into = self.into_ident(this_type);
CollectionSetterBounds::Generic {
argument_bound: quote!(#into<conjure_object::Bytes>),
assign_rhs: quote!(#value_ident.into()),
}
}
PrimitiveType::Any => CollectionSetterBounds::Generic {
argument_bound: quote!(conjure_object::serde::Serialize),
assign_rhs: quote! {
conjure_object::Any::new(#value_ident).expect("value failed to serialize")
},
Type::Primitive(primitive) => match primitive {
PrimitiveType::String => BuilderItemConfig::Into {
type_: self.string_ident(this_type),
},
PrimitiveType::Binary => BuilderItemConfig::Into {
type_: quote!(conjure_object::Bytes),
},
_ => CollectionSetterBounds::Simple {
argument_type: self.rust_type_inner(this_type, def, key),
assign_rhs: value_ident,
PrimitiveType::Any => BuilderItemConfig::Custom {
type_: quote!(impl conjure_object::serde::Serialize),
convert: quote!(
|v| conjure_object::Any::new(v).expect("value failed to serialize")
),
},
_ => BuilderItemConfig::Normal {
type_: self.rust_type_inner(this_type, def, key),
},
},
Type::Optional(def) => {
let into = self.into_ident(this_type);
let option = self.option_ident(this_type);
let item_type = self.rust_type(this_type, def.item_type());
CollectionSetterBounds::Generic {
argument_bound: quote!(#into<#option<#item_type>>),
assign_rhs: quote!(#value_ident.into()),
BuilderItemConfig::Into {
type_: quote!(#option<#item_type>),
}
}
Type::List(def) => {
let into_iterator = self.into_iterator_ident(this_type);
let item_type = self.rust_type_inner(this_type, def.item_type(), key);
CollectionSetterBounds::Generic {
argument_bound: quote!(#into_iterator<Item = #item_type>),
assign_rhs: quote!(#value_ident.into_iter().collect()),
BuilderItemConfig::Custom {
type_: quote!(impl #into_iterator<Item = #item_type>),
convert: quote!(|v| v.into_iter().collect()),
}
}
Type::Set(def) => {
let into_iterator = self.into_iterator_ident(this_type);
let item_type = self.rust_type_inner(this_type, def.item_type(), true);
CollectionSetterBounds::Generic {
argument_bound: quote!(#into_iterator<Item = #item_type>),
assign_rhs: quote!(#value_ident.into_iter().collect()),
BuilderItemConfig::Custom {
type_: quote!(impl #into_iterator<Item = #item_type>),
convert: quote!(|v| v.into_iter().collect()),
}
}
Type::Map(def) => {
let into_iterator = self.into_iterator_ident(this_type);
let key_type = self.rust_type_inner(this_type, def.key_type(), true);
let value_type = self.rust_type(this_type, def.value_type());
CollectionSetterBounds::Generic {
argument_bound: quote!(#into_iterator<Item = (#key_type, #value_type)>),
assign_rhs: quote!(#value_ident.into_iter().collect()),
let value_type = self.rust_type(this_type, def.key_type());
BuilderItemConfig::Custom {
type_: quote!(impl #into_iterator<Item = (#key_type, #value_type)>),
convert: quote!(|v| v.into_iter().collect()),
}
}
Type::Reference(def) => CollectionSetterBounds::Simple {
argument_type: self.type_path(this_type, def),
assign_rhs: value_ident,
Type::Reference(def) => BuilderItemConfig::Normal {
type_: self.type_path(this_type, def),
},
Type::External(def) => {
self.collection_setter_bounds(this_type, def.fallback(), value_ident, key)
}
Type::External(def) => self.builder_item_config(this_type, def.fallback(), key),
}
}

Expand Down Expand Up @@ -918,11 +825,6 @@ impl Context {
self.prelude_ident(name, "Vec", "std::vec::Vec")
}

#[allow(clippy::wrong_self_convention)]
pub fn from_ident(&self, name: &TypeName) -> TokenStream {
self.prelude_ident(name, "From", "std::convert::From")
}

#[allow(clippy::wrong_self_convention)]
pub fn into_ident(&self, name: &TypeName) -> TokenStream {
self.prelude_ident(name, "Into", "std::convert::Into")
Expand Down Expand Up @@ -1160,41 +1062,34 @@ impl Context {
}
}

pub enum SetterBounds {
Simple {
argument_type: TokenStream,
assign_rhs: TokenStream,
},
Generic {
argument_bound: TokenStream,
assign_rhs: TokenStream,
},
Collection {
argument_bound: TokenStream,
type_: CollectionType,
pub enum BuilderConfig {
Normal,
Into,
Custom {
type_: TokenStream,
convert: TokenStream,
},
}

pub enum CollectionType {
List {
value: CollectionSetterBounds,
item: BuilderItemConfig,
},
Set {
value: CollectionSetterBounds,
item: BuilderItemConfig,
},
Map {
key: CollectionSetterBounds,
value: CollectionSetterBounds,
key: BuilderItemConfig,
value: BuilderItemConfig,
},
}

pub enum CollectionSetterBounds {
Simple {
argument_type: TokenStream,
assign_rhs: TokenStream,
pub enum BuilderItemConfig {
Normal {
type_: TokenStream,
},
Into {
type_: TokenStream,
},
Generic {
argument_bound: TokenStream,
assign_rhs: TokenStream,
Custom {
type_: TokenStream,
convert: TokenStream,
},
}
Loading