Skip to content

Propagate oneofs_nonexhaustive value to descendant contexts #748

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Propagate oneofs_nonexhaustive value to descendant contexts #748

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edcf973
Use destructuring instead of field point access
akonradi-signal Dec 2, 2024
6015b8d
Propagate oneofs_non_exhaustive value
akonradi-signal Dec 2, 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
37 changes: 27 additions & 10 deletions protobuf-codegen/src/customize/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,33 +190,50 @@ impl Customize {

/// Update fields of self with fields defined in other customize
pub fn update_with(&mut self, that: &Customize) {
if let Some(v) = &that.before {
self.before = Some(v.clone());
// Intentionally exhaustive destructuring ensures that if fields are
// added but not at least mentioned here, this code won't compile.
let Customize {
before,
generate_accessors,
generate_getter,
tokio_bytes,
tokio_bytes_for_string,
oneofs_non_exhaustive,
lite_runtime,
gen_mod_rs,
inside_protobuf,
btreemap,
} = that.clone();
if let Some(v) = before {
self.before = Some(v);
}
if let Some(v) = that.generate_accessors {
if let Some(v) = generate_accessors {
self.generate_accessors = Some(v);
}
if let Some(v) = that.generate_getter {
if let Some(v) = generate_getter {
self.generate_getter = Some(v);
}
if let Some(v) = that.tokio_bytes {
if let Some(v) = tokio_bytes {
self.tokio_bytes = Some(v);
}
if let Some(v) = that.tokio_bytes_for_string {
if let Some(v) = tokio_bytes_for_string {
self.tokio_bytes_for_string = Some(v);
}
if let Some(v) = that.lite_runtime {
if let Some(v) = lite_runtime {
self.lite_runtime = Some(v);
}
if let Some(v) = that.gen_mod_rs {
if let Some(v) = gen_mod_rs {
self.gen_mod_rs = Some(v);
}
if let Some(v) = that.inside_protobuf {
if let Some(v) = inside_protobuf {
self.inside_protobuf = Some(v);
}
if let Some(v) = that.btreemap {
if let Some(v) = btreemap {
self.btreemap = Some(v);
}
if let Some(v) = oneofs_non_exhaustive {
self.oneofs_non_exhaustive = Some(v);
}
}

/// Update unset fields of self with fields from other customize
Expand Down
Loading