From d2e30fb2ef77e6eadc50c85e162b89a1cd6aaa38 Mon Sep 17 00:00:00 2001 From: Yuri Astrakhan Date: Fri, 29 Nov 2024 05:01:55 -0500 Subject: [PATCH] Bump to 2021 edition This will make it possible to introduce C-string literals and possibly other language features in separate PRs --- bindgen-cli/Cargo.toml | 2 +- bindgen-integration/Cargo.toml | 2 +- bindgen-integration/src/lib.rs | 2 +- bindgen-tests/Cargo.toml | 2 +- bindgen-tests/tests/expectations/Cargo.toml | 2 +- bindgen-tests/tests/quickchecking/Cargo.toml | 2 +- bindgen/Cargo.toml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bindgen-cli/Cargo.toml b/bindgen-cli/Cargo.toml index 2e5bf1b47f..d6ab1b06e2 100644 --- a/bindgen-cli/Cargo.toml +++ b/bindgen-cli/Cargo.toml @@ -12,7 +12,7 @@ repository = "https://github.com/rust-lang/rust-bindgen" documentation = "https://docs.rs/bindgen" homepage = "https://rust-lang.github.io/rust-bindgen/" version = "0.70.1" -edition = "2018" +edition = "2021" rust-version = "1.70.0" [[bin]] diff --git a/bindgen-integration/Cargo.toml b/bindgen-integration/Cargo.toml index cf89e2d9b9..38b52322cc 100644 --- a/bindgen-integration/Cargo.toml +++ b/bindgen-integration/Cargo.toml @@ -4,7 +4,7 @@ description = "A package to test various bindgen features" version = "0.1.0" authors = ["Emilio Cobos Álvarez "] publish = false -edition = "2018" +edition = "2021" build = "build.rs" [build-dependencies] diff --git a/bindgen-integration/src/lib.rs b/bindgen-integration/src/lib.rs index 48cfe092d2..b939d25b25 100755 --- a/bindgen-integration/src/lib.rs +++ b/bindgen-integration/src/lib.rs @@ -259,7 +259,7 @@ fn test_matching_with_rename() { #[test] fn test_macro_customintkind_path() { - let v: &std::any::Any = &bindings::TESTMACRO_CUSTOMINTKIND_PATH; + let v: &dyn std::any::Any = &bindings::TESTMACRO_CUSTOMINTKIND_PATH; assert!(v.is::()) } diff --git a/bindgen-tests/Cargo.toml b/bindgen-tests/Cargo.toml index 4a92f81f55..b9547bb1ad 100644 --- a/bindgen-tests/Cargo.toml +++ b/bindgen-tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bindgen-tests" -edition = "2018" +edition = "2021" version = "0.1.0" publish = false diff --git a/bindgen-tests/tests/expectations/Cargo.toml b/bindgen-tests/tests/expectations/Cargo.toml index adb95d56d2..e95e9dcb1c 100644 --- a/bindgen-tests/tests/expectations/Cargo.toml +++ b/bindgen-tests/tests/expectations/Cargo.toml @@ -7,7 +7,7 @@ authors = [ "Emilio Cobos Álvarez ", "The Servo project developers", ] -edition = "2018" +edition = "2021" publish = false [dependencies] diff --git a/bindgen-tests/tests/quickchecking/Cargo.toml b/bindgen-tests/tests/quickchecking/Cargo.toml index 0fafac97f3..998643bbf4 100644 --- a/bindgen-tests/tests/quickchecking/Cargo.toml +++ b/bindgen-tests/tests/quickchecking/Cargo.toml @@ -4,7 +4,7 @@ description = "Bindgen property tests with quickcheck. Generate random valid C c version = "0.0.0" publish = false rust-version = "1.70" -edition = "2018" +edition = "2021" [lib] name = "quickchecking" diff --git a/bindgen/Cargo.toml b/bindgen/Cargo.toml index d8b872b77c..47462e1788 100644 --- a/bindgen/Cargo.toml +++ b/bindgen/Cargo.toml @@ -15,7 +15,7 @@ repository = "https://github.com/rust-lang/rust-bindgen" documentation = "https://docs.rs/bindgen" homepage = "https://rust-lang.github.io/rust-bindgen/" version = "0.70.1" -edition = "2018" +edition = "2021" build = "build.rs" # If you change this, also update README.md and msrv in .github/workflows/bindgen.yml rust-version = "1.70.0"