Merge pull request #797 from sdroege/simple-action-by-value

sdroege · web-flow · commit 0f30c7eabd39 · 2022-12-28T15:25:15.000+02:00
examples: Fix compilation after `gio::SimpleAction` constructor took …
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -18,7 +18,7 @@ jobs:
           - stable
           - beta
           - nightly
-          - "1.63.0"
+          - "1.64.0"
         conf:
           - { name: "atk", features: "v2_34", test_sys: false } # disable for now, until we get 2.38 on the docker image
           - { name: "gdk", features: "v3_24", test_sys: true }
@@ -98,7 +98,7 @@ jobs:
           - stable
           - beta
           - nightly
-          - "1.63.0"
+          - "1.64.0"
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
diff --git a/atk/Cargo.toml b/atk/Cargo.toml
@@ -12,7 +12,7 @@ keywords = ["atk", "gtk-rs", "gnome", "accessibility"]
 repository = "https://github.com/gtk-rs/gtk3-rs"
 exclude = ["gir-files/*"]
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.64"
 
 [lib]
 name = "atk"
diff --git a/atk/sys/Cargo.toml b/atk/sys/Cargo.toml
@@ -39,7 +39,7 @@ name = "atk-sys"
 repository = "https://github.com/gtk-rs/gtk3-rs"
 version = "0.17.0"
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.64"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps.atk]
diff --git a/examples/menu_bar_system/main.rs b/examples/menu_bar_system/main.rs
@@ -83,7 +83,7 @@ fn add_actions(
     window: &gtk::ApplicationWindow,
 ) {
     // Thanks to this method, we can say that this item is actually a checkbox.
-    let switch_action = gio::SimpleAction::new_stateful("switch", None, &false.to_variant());
+    let switch_action = gio::SimpleAction::new_stateful("switch", None, false.to_variant());
     switch_action.connect_activate(glib::clone!(@weak switch => move |g, _| {
         let mut is_active = false;
         if let Some(g) = g.state() {
diff --git a/gdk/Cargo.toml b/gdk/Cargo.toml
@@ -13,7 +13,7 @@ exclude = [
     "gir-files/*",
 ]
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.64"
 
 [lib]
 name = "gdk"
diff --git a/gdk/sys/Cargo.toml b/gdk/sys/Cargo.toml
@@ -52,7 +52,7 @@ name = "gdk-sys"
 repository = "https://github.com/gtk-rs/gtk3-rs"
 version = "0.17.0"
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.64"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps.gdk_3_0]
diff --git a/gdkwayland/Cargo.toml b/gdkwayland/Cargo.toml
@@ -10,7 +10,7 @@ name = "gdkwayland"
 readme = "README.md"
 repository = "https://github.com/gtk-rs/gtk3-rs"
 version = "0.17.0"
-rust-version = "1.63"
+rust-version = "1.64"
 
 [features]
 v3_24 = ["ffi/v3_24", "gdk/v3_24"]
diff --git a/gdkwayland/src/wayland_window.rs b/gdkwayland/src/wayland_window.rs
@@ -44,13 +44,13 @@ impl WaylandWindow {
         ) {
             let window = from_glib_borrow(window);
             let handle: Borrowed<glib::GString> = from_glib_borrow(handle);
-            let callback: &P = &*(user_data as *mut _);
+            let callback = &*(user_data as *mut P);
             (*callback)(&window, handle.as_str());
         }
         unsafe extern "C" fn destroy_notify<P: Fn(&WaylandWindow, &str) + 'static>(
             data: glib::ffi::gpointer,
         ) {
-            let _ = Box::from_raw(data as *mut _);
+            let _ = Box::from_raw(data as *mut P);
         }
         unsafe {
             from_glib(ffi::gdk_wayland_window_export_handle(
diff --git a/gdkwayland/sys/Cargo.toml b/gdkwayland/sys/Cargo.toml
@@ -8,7 +8,7 @@ name = "gdkwayland-sys"
 repository = "https://github.com/gtk-rs/gtk3-rs"
 version = "0.17.0"
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.64"
 
 [lib]
 name = "gdk_wayland_sys"
diff --git a/gdkx11/Cargo.toml b/gdkx11/Cargo.toml
@@ -11,7 +11,7 @@ description = "Rust bindings for the GDK X11 library"
 repository = "https://github.com/gtk-rs/gtk3-rs"
 exclude = ["gir-files/*"]
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.64"
 
 [lib]
 name = "gdkx11"
diff --git a/gdkx11/sys/Cargo.toml b/gdkx11/sys/Cargo.toml
@@ -9,7 +9,7 @@ name = "gdkx11-sys"
 version = "0.17.0"
 build = "build.rs"
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.64"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps.gdk_x11_3_0]
diff --git a/gtk/Cargo.toml b/gtk/Cargo.toml
@@ -13,7 +13,7 @@ repository = "https://github.com/gtk-rs/gtk3-rs"
 build = "build.rs"
 exclude = ["gir-files/*"]
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.64"
 
 [lib]
 name = "gtk"
diff --git a/gtk/src/list_store.rs b/gtk/src/list_store.rs
@@ -69,19 +69,17 @@ impl<O: IsA<ListStore>> GtkListStoreExtManual for O {
             for (column, value) in columns_and_values {
                 assert!(
                     *column < n_columns,
-                    "got column {} which is higher than the number of columns {}",
+                    "got column {} which is higher than the number of columns {n_columns}",
                     *column,
-                    n_columns
                 );
                 let type_ = from_glib(ffi::gtk_tree_model_get_column_type(
                     self.as_ref().upcast_ref::<TreeModel>().to_glib_none().0,
                     *column as c_int,
                 ));
                 assert!(
                     Value::type_transformable(value.value_type(), type_),
-                    "column {} is of type {} but found value of type {}",
+                    "column {} is of type {type_} but found value of type {}",
                     *column,
-                    type_,
                     value.value_type()
                 );
             }
@@ -117,8 +115,7 @@ impl<O: IsA<ListStore>> GtkListStoreExtManual for O {
             let safe_count = count as usize == new_order.len();
             debug_assert!(
                 safe_count,
-                "Incorrect `new_order` slice length. Expected `{}`, found `{}`.",
-                count,
+                "Incorrect `new_order` slice length. Expected `{count}`, found `{}`.",
                 new_order.len()
             );
             let safe_values = new_order.iter().max().map_or(true, |&max| {
@@ -128,9 +125,8 @@ impl<O: IsA<ListStore>> GtkListStoreExtManual for O {
             debug_assert!(
                 safe_values,
                 "Some `new_order` slice values are out of range. Maximum safe value: \
-                 `{}`. The slice contents: `{:?}`",
+                 `{}`. The slice contents: `{new_order:?}`",
                 count - 1,
-                new_order
             );
             if safe_count && safe_values {
                 ffi::gtk_list_store_reorder(
@@ -148,26 +144,23 @@ impl<O: IsA<ListStore>> GtkListStoreExtManual for O {
             ) as u32;
             assert!(
                 columns_and_values.len() <= n_columns as usize,
-                "got values for {} columns but only {} columns exist",
+                "got values for {} columns but only {n_columns} columns exist",
                 columns_and_values.len(),
-                n_columns
             );
             for (column, value) in columns_and_values {
                 assert!(
                     *column < n_columns,
-                    "got column {} which is higher than the number of columns {}",
+                    "got column {} which is higher than the number of columns {n_columns}",
                     *column,
-                    n_columns
                 );
                 let type_ = from_glib(ffi::gtk_tree_model_get_column_type(
                     self.as_ref().upcast_ref::<TreeModel>().to_glib_none().0,
                     *column as c_int,
                 ));
                 assert!(
                     Value::type_transformable(value.value_type(), type_),
-                    "column {} is of type {} but found value of type {}",
+                    "column {} is of type {type_} but found value of type {}",
                     *column,
-                    type_,
                     value.value_type()
                 );
             }
@@ -198,9 +191,7 @@ impl<O: IsA<ListStore>> GtkListStoreExtManual for O {
             ) as u32;
             assert!(
                 column < columns,
-                "got column {} which is higher than the number of columns {}",
-                column,
-                columns
+                "got column {column} which is higher than the number of columns {columns}",
             );
 
             let type_ = from_glib(ffi::gtk_tree_model_get_column_type(
@@ -209,9 +200,7 @@ impl<O: IsA<ListStore>> GtkListStoreExtManual for O {
             ));
             assert!(
                 Value::type_transformable(value.type_(), type_),
-                "column {} is of type {} but found value of type {}",
-                column,
-                type_,
+                "column {column} is of type {type_} but found value of type {}",
                 value.type_()
             );
 
diff --git a/gtk/src/tree_store.rs b/gtk/src/tree_store.rs
@@ -63,26 +63,23 @@ impl<O: IsA<TreeStore>> TreeStoreExtManual for O {
             ) as u32;
             assert!(
                 columns_and_values.len() <= n_columns as usize,
-                "got values for {} columns but only {} columns exist",
+                "got values for {} columns but only {n_columns} columns exist",
                 columns_and_values.len(),
-                n_columns
             );
             for (column, value) in columns_and_values {
                 assert!(
                     *column < n_columns,
-                    "got column {} which is higher than the number of columns {}",
+                    "got column {} which is higher than the number of columns {n_columns}",
                     *column,
-                    n_columns
                 );
                 let type_ = from_glib(ffi::gtk_tree_model_get_column_type(
                     self.as_ref().upcast_ref::<TreeModel>().to_glib_none().0,
                     *column as c_int,
                 ));
                 assert!(
                     Value::type_transformable(value.value_type(), type_),
-                    "column {} is of type {} but found value of type {}",
+                    "column {} is of type {type_} but found value of type {}",
                     *column,
-                    type_,
                     value.value_type()
                 );
             }
@@ -119,8 +116,7 @@ impl<O: IsA<TreeStore>> TreeStoreExtManual for O {
             let safe_count = count as usize == new_order.len();
             debug_assert!(
                 safe_count,
-                "Incorrect `new_order` slice length. Expected `{}`, found `{}`.",
-                count,
+                "Incorrect `new_order` slice length. Expected `{count}`, found `{}`.",
                 new_order.len()
             );
             let safe_values = new_order.iter().max().map_or(true, |&max| {
@@ -130,9 +126,8 @@ impl<O: IsA<TreeStore>> TreeStoreExtManual for O {
             debug_assert!(
                 safe_values,
                 "Some `new_order` slice values are out of range. Maximum safe value: \
-                 `{}`. The slice contents: `{:?}`",
+                 `{}`. The slice contents: `{new_order:?}`",
                 count - 1,
-                new_order
             );
             if safe_count && safe_values {
                 ffi::gtk_tree_store_reorder(
@@ -158,19 +153,17 @@ impl<O: IsA<TreeStore>> TreeStoreExtManual for O {
             for (column, value) in columns_and_values {
                 assert!(
                     *column < n_columns,
-                    "got column {} which is higher than the number of columns {}",
+                    "got column {} which is higher than the number of columns {n_columns}",
                     *column,
-                    n_columns
                 );
                 let type_ = from_glib(ffi::gtk_tree_model_get_column_type(
                     self.as_ref().upcast_ref::<TreeModel>().to_glib_none().0,
                     *column as c_int,
                 ));
                 assert!(
                     Value::type_transformable(value.value_type(), type_),
-                    "column {} is of type {} but found value of type {}",
+                    "column {} is of type {type_} but found value of type {}",
                     *column,
-                    type_,
                     value.value_type()
                 );
             }
@@ -201,9 +194,7 @@ impl<O: IsA<TreeStore>> TreeStoreExtManual for O {
             ) as u32;
             assert!(
                 column < columns,
-                "got column {} which is higher than the number of columns {}",
-                column,
-                columns
+                "got column {column} which is higher than the number of columns {columns}",
             );
 
             let type_ = from_glib(ffi::gtk_tree_model_get_column_type(
@@ -212,9 +203,7 @@ impl<O: IsA<TreeStore>> TreeStoreExtManual for O {
             ));
             assert!(
                 Value::type_transformable(value.type_(), type_),
-                "column {} is of type {} but found value of type {}",
-                column,
-                type_,
+                "column {column} is of type {type_} but found value of type {}",
                 value.type_()
             );
 
diff --git a/gtk/sys/Cargo.toml b/gtk/sys/Cargo.toml
@@ -10,7 +10,7 @@ keywords = ["gtk", "ffi", "gtk-rs", "gnome"]
 license = "MIT"
 repository = "https://github.com/gtk-rs/gtk3-rs"
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.64"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps."gtk+_3_0"]
diff --git a/gtk3-macros/Cargo.toml b/gtk3-macros/Cargo.toml
@@ -14,7 +14,7 @@ exclude = [
     "gir-files/*",
     "src/composite_template.ui"
 ]
-rust-version = "1.63"
+rust-version = "1.64"
 
 [lib]
 proc-macro = true

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ exclude = [`
`13`	`13`	`"gir-files/*",`
`14`	`14`	`]`
`15`	`15`	`edition = "2021"`
`16`		`-rust-version = "1.63"`
	`16`	`+rust-version = "1.64"`
`17`	`17`
`18`	`18`	`[lib]`
`19`	`19`	`name = "gdk"`