glib: Make <Variant as HasParamSpec>::BuilderFn generic over lifetimes

gtk-rs · Sep 26, 2024 · b825e64 · b825e64
1 parent e651fc0
commit b825e64
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/glib-macros/tests/properties.rs b/glib-macros/tests/properties.rs
@@ -93,6 +93,8 @@ mod foo {
  string_vec: RefCell<Vec<String>>,
  #[property(get, set, builder(glib::VariantTy::DOUBLE))]
  variant: RefCell<Option<glib::Variant>>,
+ #[property(get, set, builder(&<Option<i32>>::static_variant_type()))]
+ variant2: RefCell<Option<glib::Variant>>,
  #[property(get = |_| 42.0, set)]
  infer_inline_type: RefCell<f64>,
  // The following property doesn't store any data. The value of the property is calculated

diff --git a/glib/src/param_spec.rs b/glib/src/param_spec.rs
@@ -2307,8 +2307,7 @@ has_simple_spec!(bool, ParamSpecBoolean, ParamSpecBooleanBuilder);
 impl HasParamSpec for crate::Variant {
  type ParamSpec = ParamSpecVariant;
  type SetValue = Self;
- type BuilderFn =
- fn(&'static str, ty: &'static crate::VariantTy) -> ParamSpecVariantBuilder<'static>;
+ type BuilderFn = for<'a> fn(&'a str, ty: &'a crate::VariantTy) -> ParamSpecVariantBuilder<'a>;
 
  fn param_spec_builder() -> Self::BuilderFn {
  Self::ParamSpec::builder