Skip to content

Commit 3f542a5

Browse files
committed
impl Default for ParamFlags
1 parent 4a39b82 commit 3f542a5

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

glib/src/gobject/flags.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ bitflags::bitflags! {
3232
}
3333
}
3434

35+
impl Default for ParamFlags {
36+
fn default() -> Self {
37+
ParamFlags::READWRITE
38+
}
39+
}
40+
3541
#[doc(hidden)]
3642
impl IntoGlib for ParamFlags {
3743
type GlibType = gobject_ffi::GParamFlags;

glib/src/param_spec.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ macro_rules! define_builder {
441441
name: &'a str,
442442
nick: Option<&'a str>,
443443
blurb: Option<&'a str>,
444-
flags: Option<crate::ParamFlags>, // `ParamFlags` doesn't implement `Default` so I wrap it in `Option`
444+
flags: crate::ParamFlags,
445445
$($field_id: Option<$field_ty>),*
446446
}
447447
impl<'a> $builder_type<'a> {
@@ -458,7 +458,7 @@ macro_rules! define_builder {
458458

459459
/// Default: `glib::ParamFlags::READWRITE`
460460
pub fn flags(mut self, flags: crate::ParamFlags) -> Self {
461-
self.flags = Some(flags);
461+
self.flags = flags;
462462
self
463463
}
464464

@@ -481,7 +481,7 @@ macro_rules! define_builder {
481481
$(.or(Some($field_expr)))?
482482
.expect("impossible: missing parameter in ParamSpec*Builder")
483483
,)*
484-
self.flags.unwrap_or(crate::ParamFlags::READWRITE),
484+
self.flags
485485
)
486486
}
487487
}

0 commit comments

Comments
 (0)