[gnome-builder/gnome-builder-42] meson-templates: Bump Rust dependencies



commit 8e48f19c1d8cc34c2eac4cd20981333a892869f0
Author: William Roy <wroy pm me>
Date:   Sat Apr 16 17:17:11 2022 +0000

    meson-templates: Bump Rust dependencies

 src/plugins/meson-templates/resources/src/Cargo-cli.toml  |  2 +-
 src/plugins/meson-templates/resources/src/Cargo-gtk4.toml |  6 +++---
 src/plugins/meson-templates/resources/src/Cargo.toml      | 12 ++++++------
 src/plugins/meson-templates/resources/src/config.rs.in    |  4 +++-
 src/plugins/meson-templates/resources/src/main.rs         |  6 ++----
 src/plugins/meson-templates/resources/src/window.rs       |  4 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/src/plugins/meson-templates/resources/src/Cargo-cli.toml 
b/src/plugins/meson-templates/resources/src/Cargo-cli.toml
index 4bccb97fd..a9e2947e8 100644
--- a/src/plugins/meson-templates/resources/src/Cargo-cli.toml
+++ b/src/plugins/meson-templates/resources/src/Cargo-cli.toml
@@ -1,4 +1,4 @@
 [package]
 name = "{{name}}"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
diff --git a/src/plugins/meson-templates/resources/src/Cargo-gtk4.toml 
b/src/plugins/meson-templates/resources/src/Cargo-gtk4.toml
index ed7e26c24..ae529f6a3 100644
--- a/src/plugins/meson-templates/resources/src/Cargo-gtk4.toml
+++ b/src/plugins/meson-templates/resources/src/Cargo-gtk4.toml
@@ -1,14 +1,14 @@
 [package]
 name = "{{name}}"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 gettext-rs = { version = "0.7", features = ["gettext-system"] }
-gtk = { version = "0.4", package = "gtk4" }
+gtk = { version = "0.4.7", package = "gtk4" }
 
 {{if is_adwaita}}
 [dependencies.adw]
 package = "libadwaita"
-version  = "0.1.0"
+version  = "0.1.1"
 {{end}}
diff --git a/src/plugins/meson-templates/resources/src/Cargo.toml 
b/src/plugins/meson-templates/resources/src/Cargo.toml
index d8cd01639..4f921dd69 100644
--- a/src/plugins/meson-templates/resources/src/Cargo.toml
+++ b/src/plugins/meson-templates/resources/src/Cargo.toml
@@ -1,24 +1,24 @@
 [package]
 name = "{{name}}"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies.gtk]
-version = "0.8.1"
+version = "0.15.4"
 features = ["v3_24"]
 
 [dependencies.gdk]
-version = "0.12.1"
+version = "0.15.4"
 features = ["v3_24"]
 
 [dependencies.gio]
-version = "0.8.1"
+version = "0.15.10"
 features = ["v2_60"]
 
 [dependencies.glib]
-version = "0.9.2"
+version = "0.15.10"
 features = ["v2_60"]
 
 [dependencies.gettext-rs]
-version = "0.4.4"
+version = "0.7.0"
 features = ["gettext-system"]
diff --git a/src/plugins/meson-templates/resources/src/config.rs.in 
b/src/plugins/meson-templates/resources/src/config.rs.in
index edb2c8955..3e05f6d4f 100644
--- a/src/plugins/meson-templates/resources/src/config.rs.in
+++ b/src/plugins/meson-templates/resources/src/config.rs.in
@@ -1,3 +1,5 @@
+#![allow(dead_code)]
+
 pub static PKGDATADIR: &str = @pkgdatadir@;
 pub static VERSION: &str = @VERSION@;
-pub static LOCALEDIR: &str = @localedir@;
\ No newline at end of file
+pub static LOCALEDIR: &str = @localedir@;
diff --git a/src/plugins/meson-templates/resources/src/main.rs 
b/src/plugins/meson-templates/resources/src/main.rs
index dc5934574..775fd4623 100644
--- a/src/plugins/meson-templates/resources/src/main.rs
+++ b/src/plugins/meson-templates/resources/src/main.rs
@@ -10,14 +10,12 @@ fn main() {
     gtk::init().unwrap_or_else(|_| panic!("Failed to initialize GTK."));
 
     setlocale(LocaleCategory::LcAll, "");
-    bindtextdomain("{{name}}", config::LOCALEDIR);
-    textdomain("{{name}}");
 
     let res = gio::Resource::load(config::PKGDATADIR.to_owned() + "/{{name}}.gresource")
         .expect("Could not load resources");
     gio::resources_register(&res);
 
-    let app = gtk::Application::new(Some("{{appid}}"), Default::default()).unwrap();
+    let app = gtk::Application::new(Some("{{appid}}"), Default::default());
     app.connect_activate(move |app| {
         let window = Window::new();
 
@@ -26,6 +24,6 @@ fn main() {
         window.widget.present();
     });
 
-    let ret = app.run(&std::env::args().collect::<Vec<_>>());
+    let ret = app.run();
     std::process::exit(ret);
 }
diff --git a/src/plugins/meson-templates/resources/src/window.rs 
b/src/plugins/meson-templates/resources/src/window.rs
index a535a1666..2857060a7 100644
--- a/src/plugins/meson-templates/resources/src/window.rs
+++ b/src/plugins/meson-templates/resources/src/window.rs
@@ -6,9 +6,9 @@ pub struct Window {
 
 impl Window {
     pub fn new() -> Self {
-        let builder = gtk::Builder::new_from_resource("{{appid_path}}/{{ui_file}}");
+        let builder = gtk::Builder::from_resource("{{appid_path}}/{{ui_file}}");
         let widget: gtk::ApplicationWindow = builder
-            .get_object("window")
+            .object("window")
             .expect("Failed to find the window object");
 
         Self { widget }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]