Merge pull request #1244 from sdroege/edition-2021

Switch to 2021 edition
gtk-rs · Oct 29, 2021 · 7b93dbf · 7b93dbf
2 parents f47b683 + 364678b
commit 7b93dbf
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,7 @@ authors = [
 ]
 build = "build.rs"
 exclude = ["Gir*.toml", "tests/**/*", "*.md", "generator.py"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 bitflags = "1.0"

diff --git a/src/codegen/sys/cargo_toml.rs b/src/codegen/sys/cargo_toml.rs
@@ -36,7 +36,7 @@ fn fill_empty(root: &mut Table, env: &Env, crate_name: &str) {
         let package = upsert_table(root, "package");
         set_string(package, "name", package_name);
         set_string(package, "version", "0.0.1");
-        set_string(package, "edition", "2018");
+        set_string(package, "edition", "2021");
     }
 
     {

diff --git a/tests/sys/atk-sys/Cargo.toml b/tests/sys/atk-sys/Cargo.toml
@@ -33,7 +33,7 @@ name = "atk_sys"
 build = "build.rs"
 name = "atk-sys"
 version = "0.2.0"
-edition = "2018"
+edition = "2021"
 [package.metadata.system-deps.atk]
 name = "atk"
 version = "2.4"

diff --git a/tests/sys/gdk-pixbuf-sys/Cargo.toml b/tests/sys/gdk-pixbuf-sys/Cargo.toml
@@ -31,7 +31,7 @@ name = "gdk_pixbuf_sys"
 build = "build.rs"
 name = "gdk-pixbuf-sys"
 version = "0.2.0"
-edition = "2018"
+edition = "2021"
 [package.metadata.system-deps.gdk_pixbuf_2_0]
 name = "gdk-pixbuf-2.0"
 version = "2.26"

diff --git a/tests/sys/gdk-sys/Cargo.toml b/tests/sys/gdk-sys/Cargo.toml
@@ -44,7 +44,7 @@ name = "gdk_sys"
 build = "build.rs"
 name = "gdk-sys"
 version = "0.2.0"
-edition = "2018"
+edition = "2021"
 [package.metadata.system-deps.gdk_3_0]
 name = "gdk-3.0"
 version = "3.4"

diff --git a/tests/sys/gio-sys/Cargo.toml b/tests/sys/gio-sys/Cargo.toml
@@ -39,7 +39,7 @@ name = "gio_sys"
 build = "build.rs"
 name = "gio-sys"
 version = "0.2.0"
-edition = "2018"
+edition = "2021"
 [package.metadata.system-deps.gio_2_0]
 name = "gio-2.0"
 version = "2.32"

diff --git a/tests/sys/glib-sys/Cargo.toml b/tests/sys/glib-sys/Cargo.toml
@@ -32,7 +32,7 @@ name = "glib_sys"
 build = "build.rs"
 name = "glib-sys"
 version = "0.2.0"
-edition = "2018"
+edition = "2021"
 [package.metadata.system-deps.glib_2_0]
 name = "glib-2.0"
 version = "2.32"

diff --git a/tests/sys/gobject-sys/Cargo.toml b/tests/sys/gobject-sys/Cargo.toml
@@ -29,7 +29,7 @@ name = "gobject_sys"
 build = "build.rs"
 name = "gobject-sys"
 version = "0.2.0"
-edition = "2018"
+edition = "2021"
 [package.metadata.system-deps.gobject_2_0]
 name = "gobject-2.0"
 version = "2.32"

diff --git a/tests/sys/gtk-sys/Cargo.toml b/tests/sys/gtk-sys/Cargo.toml
@@ -57,7 +57,7 @@ name = "gtk_sys"
 build = "build.rs"
 name = "gtk-sys"
 version = "0.2.0"
-edition = "2018"
+edition = "2021"
 [package.metadata.system-deps."gtk+_3_0"]
 name = "gtk+-3.0"
 version = "3.4"

diff --git a/tests/sys/pango-sys/Cargo.toml b/tests/sys/pango-sys/Cargo.toml
@@ -31,7 +31,7 @@ name = "pango_sys"
 build = "build.rs"
 name = "pango-sys"
 version = "0.2.0"
-edition = "2018"
+edition = "2021"
 [package.metadata.system-deps.pango]
 name = "pango"
 version = "1.30"

diff --git a/tests/sys/sys_build/Cargo.toml b/tests/sys/sys_build/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sys_build"
 version = "0.0.1"
-edition = "2018"
+edition = "2021"
 
 [features]
 full = []