Merge pull request #914 from sdroege/regen

Regenerate with latest gir and mark suboptimal `Object` constructors as deprecated

Author: sdroege

gdk-pixbuf/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ d7bdac6deb40)
+Generated by gir (https://github.com/gtk-rs/gir @ 2d5d67805483)
 from gir-files (https://github.com/gtk-rs/gir-files @ 040da0b3a013)

gdk-pixbuf/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ d7bdac6deb40)
+Generated by gir (https://github.com/gtk-rs/gir @ 2d5d67805483)
 from gir-files (https://github.com/gtk-rs/gir-files @ 040da0b3a013)

gio/src/async_initable.rs

@@ -16,6 +16,8 @@ impl AsyncInitable {
     #[allow(clippy::new_ret_no_self)]
     #[doc(alias = "g_async_initable_new_async")]
     #[track_caller]
+    #[deprecated = "Use AsyncInitable::builder() or AsyncInitable::new_default() instead"]
+    #[allow(deprecated)]
     pub fn new<
         O: IsClass + IsA<Object> + IsA<AsyncInitable>,
         Q: FnOnce(Result<O, glib::Error>) + 'static,
@@ -41,6 +43,8 @@ impl AsyncInitable {
     /// `AsyncInitable::init` failed.
     #[doc(alias = "g_async_initable_new_async")]
     #[track_caller]
+    #[deprecated = "Use AsyncInitable::builder() or AsyncInitable::new_default_future() instead"]
+    #[allow(deprecated)]
     pub fn new_future<O: IsClass + IsA<Object> + IsA<AsyncInitable>>(
         properties: &[(&str, &dyn ToValue)],
         io_priority: glib::Priority,
@@ -58,6 +62,7 @@ impl AsyncInitable {
     /// `AsyncInitable::init` failed.
     #[doc(alias = "g_async_initable_new_async")]
     #[track_caller]
+    #[deprecated = "Use AsyncInitable::builder() or AsyncInitable::new_default_with_type() instead"]
     pub fn with_type<Q: FnOnce(Result<Object, glib::Error>) + 'static>(
         type_: Type,
         properties: &[(&str, &dyn ToValue)],
@@ -93,6 +98,7 @@ impl AsyncInitable {
     /// `AsyncInitable::init` failed.
     #[doc(alias = "g_async_initable_new_async")]
     #[track_caller]
+    #[deprecated = "Use AsyncInitable::builder() or AsyncInitable::new_default_future() instead"]
     pub fn with_type_future(
         type_: Type,
         properties: &[(&str, &dyn ToValue)],
@@ -230,6 +236,7 @@ impl AsyncInitable {
     /// `AsyncInitable::init` failed.
     #[doc(alias = "g_async_initable_new_async")]
     #[track_caller]
+    #[deprecated = "Use AsyncInitable::with_mut_values() instead"]
     pub fn with_values<Q: FnOnce(Result<Object, glib::Error>) + 'static>(
         type_: Type,
         properties: &[(&str, glib::Value)],
@@ -265,6 +272,7 @@ impl AsyncInitable {
     /// `AsyncInitable::init` failed.
     #[doc(alias = "g_async_initable_new_async")]
     #[track_caller]
+    #[deprecated = "Use AsyncInitable::with_mut_values_future() instead"]
     pub fn with_values_future(
         type_: Type,
         properties: &[(&str, glib::Value)],

gio/src/auto/application.rs

@@ -40,7 +40,7 @@ impl Application {
     ///
     /// This method returns an instance of [`ApplicationBuilder`](crate::builders::ApplicationBuilder) which can be used to create [`Application`] objects.
     pub fn builder() -> ApplicationBuilder {
-        ApplicationBuilder::default()
+        ApplicationBuilder::new()
     }
 
     #[doc(alias = "g_application_get_default")]
@@ -62,77 +62,69 @@ impl Application {
 
 impl Default for Application {
     fn default() -> Self {
-        glib::object::Object::new::<Self>(&[])
+        glib::object::Object::new_default::<Self>()
     }
 }
 
-#[derive(Clone, Default)]
 // rustdoc-stripper-ignore-next
 /// A [builder-pattern] type to construct [`Application`] objects.
 ///
 /// [builder-pattern]: https://doc.rust-lang.org/1.0.0/style/ownership/builders.html
 #[must_use = "The builder must be built to be used"]
 pub struct ApplicationBuilder {
-    action_group: Option<ActionGroup>,
-    application_id: Option<String>,
-    flags: Option<ApplicationFlags>,
-    inactivity_timeout: Option<u32>,
-    resource_base_path: Option<String>,
+    builder: glib::object::ObjectBuilder<'static, Application>,
 }
 
 impl ApplicationBuilder {
-    // rustdoc-stripper-ignore-next
-    /// Create a new [`ApplicationBuilder`].
-    pub fn new() -> Self {
-        Self::default()
+    fn new() -> Self {
+        Self {
+            builder: glib::object::Object::builder(),
+        }
     }
 
-    // rustdoc-stripper-ignore-next
-    /// Build the [`Application`].
-    #[must_use = "Building the object from the builder is usually expensive and is not expected to have side effects"]
-    pub fn build(self) -> Application {
-        let mut properties: Vec<(&str, &dyn ToValue)> = vec![];
-        if let Some(ref action_group) = self.action_group {
-            properties.push(("action-group", action_group));
-        }
-        if let Some(ref application_id) = self.application_id {
-            properties.push(("application-id", application_id));
-        }
-        if let Some(ref flags) = self.flags {
-            properties.push(("flags", flags));
-        }
-        if let Some(ref inactivity_timeout) = self.inactivity_timeout {
-            properties.push(("inactivity-timeout", inactivity_timeout));
+    pub fn action_group(self, action_group: &impl IsA<ActionGroup>) -> Self {
+        Self {
+            builder: self
+                .builder
+                .property("action-group", action_group.clone().upcast()),
         }
-        if let Some(ref resource_base_path) = self.resource_base_path {
-            properties.push(("resource-base-path", resource_base_path));
-        }
-        glib::Object::new::<Application>(&properties)
     }
 
-    pub fn action_group(mut self, action_group: &impl IsA<ActionGroup>) -> Self {
-        self.action_group = Some(action_group.clone().upcast());
-        self
+    pub fn application_id(self, application_id: impl Into<glib::GString>) -> Self {
+        Self {
+            builder: self
+                .builder
+                .property("application-id", application_id.into()),
+        }
     }
 
-    pub fn application_id(mut self, application_id: &str) -> Self {
-        self.application_id = Some(application_id.to_string());
-        self
+    pub fn flags(self, flags: ApplicationFlags) -> Self {
+        Self {
+            builder: self.builder.property("flags", flags),
+        }
     }
 
-    pub fn flags(mut self, flags: ApplicationFlags) -> Self {
-        self.flags = Some(flags);
-        self
+    pub fn inactivity_timeout(self, inactivity_timeout: u32) -> Self {
+        Self {
+            builder: self
+                .builder
+                .property("inactivity-timeout", inactivity_timeout),
+        }
     }
 
-    pub fn inactivity_timeout(mut self, inactivity_timeout: u32) -> Self {
-        self.inactivity_timeout = Some(inactivity_timeout);
-        self
+    pub fn resource_base_path(self, resource_base_path: impl Into<glib::GString>) -> Self {
+        Self {
+            builder: self
+                .builder
+                .property("resource-base-path", resource_base_path.into()),
+        }
     }
 
-    pub fn resource_base_path(mut self, resource_base_path: &str) -> Self {
-        self.resource_base_path = Some(resource_base_path.to_string());
-        self
+    // rustdoc-stripper-ignore-next
+    /// Build the [`Application`].
+    #[must_use = "Building the object from the builder is usually expensive and is not expected to have side effects"]
+    pub fn build(self) -> Application {
+        self.builder.build()
     }
 }
 

gio/src/auto/buffered_input_stream.rs

@@ -48,65 +48,59 @@ impl BufferedInputStream {
     ///
     /// This method returns an instance of [`BufferedInputStreamBuilder`](crate::builders::BufferedInputStreamBuilder) which can be used to create [`BufferedInputStream`] objects.
     pub fn builder() -> BufferedInputStreamBuilder {
-        BufferedInputStreamBuilder::default()
+        BufferedInputStreamBuilder::new()
     }
 }
 
 impl Default for BufferedInputStream {
     fn default() -> Self {
-        glib::object::Object::new::<Self>(&[])
+        glib::object::Object::new_default::<Self>()
     }
 }
 
-#[derive(Clone, Default)]
 // rustdoc-stripper-ignore-next
 /// A [builder-pattern] type to construct [`BufferedInputStream`] objects.
 ///
 /// [builder-pattern]: https://doc.rust-lang.org/1.0.0/style/ownership/builders.html
 #[must_use = "The builder must be built to be used"]
 pub struct BufferedInputStreamBuilder {
-    buffer_size: Option<u32>,
-    base_stream: Option<InputStream>,
-    close_base_stream: Option<bool>,
+    builder: glib::object::ObjectBuilder<'static, BufferedInputStream>,
 }
 
 impl BufferedInputStreamBuilder {
-    // rustdoc-stripper-ignore-next
-    /// Create a new [`BufferedInputStreamBuilder`].
-    pub fn new() -> Self {
-        Self::default()
+    fn new() -> Self {
+        Self {
+            builder: glib::object::Object::builder(),
+        }
     }
 
-    // rustdoc-stripper-ignore-next
-    /// Build the [`BufferedInputStream`].
-    #[must_use = "Building the object from the builder is usually expensive and is not expected to have side effects"]
-    pub fn build(self) -> BufferedInputStream {
-        let mut properties: Vec<(&str, &dyn ToValue)> = vec![];
-        if let Some(ref buffer_size) = self.buffer_size {
-            properties.push(("buffer-size", buffer_size));
-        }
-        if let Some(ref base_stream) = self.base_stream {
-            properties.push(("base-stream", base_stream));
+    pub fn buffer_size(self, buffer_size: u32) -> Self {
+        Self {
+            builder: self.builder.property("buffer-size", buffer_size),
         }
-        if let Some(ref close_base_stream) = self.close_base_stream {
-            properties.push(("close-base-stream", close_base_stream));
-        }
-        glib::Object::new::<BufferedInputStream>(&properties)
     }
 
-    pub fn buffer_size(mut self, buffer_size: u32) -> Self {
-        self.buffer_size = Some(buffer_size);
-        self
+    pub fn base_stream(self, base_stream: &impl IsA<InputStream>) -> Self {
+        Self {
+            builder: self
+                .builder
+                .property("base-stream", base_stream.clone().upcast()),
+        }
     }
 
-    pub fn base_stream(mut self, base_stream: &impl IsA<InputStream>) -> Self {
-        self.base_stream = Some(base_stream.clone().upcast());
-        self
+    pub fn close_base_stream(self, close_base_stream: bool) -> Self {
+        Self {
+            builder: self
+                .builder
+                .property("close-base-stream", close_base_stream),
+        }
     }
 
-    pub fn close_base_stream(mut self, close_base_stream: bool) -> Self {
-        self.close_base_stream = Some(close_base_stream);
-        self
+    // rustdoc-stripper-ignore-next
+    /// Build the [`BufferedInputStream`].
+    #[must_use = "Building the object from the builder is usually expensive and is not expected to have side effects"]
+    pub fn build(self) -> BufferedInputStream {
+        self.builder.build()
     }
 }
 

gio/src/auto/buffered_output_stream.rs

@@ -48,74 +48,65 @@ impl BufferedOutputStream {
     ///
     /// This method returns an instance of [`BufferedOutputStreamBuilder`](crate::builders::BufferedOutputStreamBuilder) which can be used to create [`BufferedOutputStream`] objects.
     pub fn builder() -> BufferedOutputStreamBuilder {
-        BufferedOutputStreamBuilder::default()
+        BufferedOutputStreamBuilder::new()
     }
 }
 
 impl Default for BufferedOutputStream {
     fn default() -> Self {
-        glib::object::Object::new::<Self>(&[])
+        glib::object::Object::new_default::<Self>()
     }
 }
 
-#[derive(Clone, Default)]
 // rustdoc-stripper-ignore-next
 /// A [builder-pattern] type to construct [`BufferedOutputStream`] objects.
 ///
 /// [builder-pattern]: https://doc.rust-lang.org/1.0.0/style/ownership/builders.html
 #[must_use = "The builder must be built to be used"]
 pub struct BufferedOutputStreamBuilder {
-    auto_grow: Option<bool>,
-    buffer_size: Option<u32>,
-    base_stream: Option<OutputStream>,
-    close_base_stream: Option<bool>,
+    builder: glib::object::ObjectBuilder<'static, BufferedOutputStream>,
 }
 
 impl BufferedOutputStreamBuilder {
-    // rustdoc-stripper-ignore-next
-    /// Create a new [`BufferedOutputStreamBuilder`].
-    pub fn new() -> Self {
-        Self::default()
+    fn new() -> Self {
+        Self {
+            builder: glib::object::Object::builder(),
+        }
     }
 
-    // rustdoc-stripper-ignore-next
-    /// Build the [`BufferedOutputStream`].
-    #[must_use = "Building the object from the builder is usually expensive and is not expected to have side effects"]
-    pub fn build(self) -> BufferedOutputStream {
-        let mut properties: Vec<(&str, &dyn ToValue)> = vec![];
-        if let Some(ref auto_grow) = self.auto_grow {
-            properties.push(("auto-grow", auto_grow));
-        }
-        if let Some(ref buffer_size) = self.buffer_size {
-            properties.push(("buffer-size", buffer_size));
-        }
-        if let Some(ref base_stream) = self.base_stream {
-            properties.push(("base-stream", base_stream));
+    pub fn auto_grow(self, auto_grow: bool) -> Self {
+        Self {
+            builder: self.builder.property("auto-grow", auto_grow),
         }
-        if let Some(ref close_base_stream) = self.close_base_stream {
-            properties.push(("close-base-stream", close_base_stream));
-        }
-        glib::Object::new::<BufferedOutputStream>(&properties)
     }
 
-    pub fn auto_grow(mut self, auto_grow: bool) -> Self {
-        self.auto_grow = Some(auto_grow);
-        self
+    pub fn buffer_size(self, buffer_size: u32) -> Self {
+        Self {
+            builder: self.builder.property("buffer-size", buffer_size),
+        }
     }
 
-    pub fn buffer_size(mut self, buffer_size: u32) -> Self {
-        self.buffer_size = Some(buffer_size);
-        self
+    pub fn base_stream(self, base_stream: &impl IsA<OutputStream>) -> Self {
+        Self {
+            builder: self
+                .builder
+                .property("base-stream", base_stream.clone().upcast()),
+        }
     }
 
-    pub fn base_stream(mut self, base_stream: &impl IsA<OutputStream>) -> Self {
-        self.base_stream = Some(base_stream.clone().upcast());
-        self
+    pub fn close_base_stream(self, close_base_stream: bool) -> Self {
+        Self {
+            builder: self
+                .builder
+                .property("close-base-stream", close_base_stream),
+        }
     }
 
-    pub fn close_base_stream(mut self, close_base_stream: bool) -> Self {
-        self.close_base_stream = Some(close_base_stream);
-        self
+    // rustdoc-stripper-ignore-next
+    /// Build the [`BufferedOutputStream`].
+    #[must_use = "Building the object from the builder is usually expensive and is not expected to have side effects"]
+    pub fn build(self) -> BufferedOutputStream {
+        self.builder.build()
     }
 }