Revert "Upgrade to Rust 2021 edition"

This reverts commit 55a5fef.
PyO3 · Nov 28, 2021 · eb46dfe · eb46dfe
1 parent 03a3290
commit eb46dfe
Show file tree

Hide file tree

Showing 19 changed files with 22 additions and 21 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ repository = "https://github.com/pyo3/maturin"
 license = "MIT OR Apache-2.0"
 keywords = ["python", "cffi", "packaging", "pypi", "pyo3"]
 categories = ["api-bindings", "development-tools::ffi", "command-line-utilities"]
-edition = "2021"
+edition = "2018"
 
 [badges]
 travis-ci = { repository = "PyO3/maturin" }

diff --git a/Changelog.md b/Changelog.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Use platform tag from `sysconfig.platform` on non-portable Linux in [#709](https://github.com/PyO3/maturin/pull/709)
 * Consider current machine architecture when generating platform tags for abi3
   wheels on linux in [#709](https://github.com/PyO3/maturin/pull/709)
+* Revert back to Rust 2018 edition in [#710](https://github.com/PyO3/maturin/pull/710)
 
 ## [0.12.2] - 2021-11-26
 

diff --git a/test-crates/cargo-mock/Cargo.toml b/test-crates/cargo-mock/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cargo-mock"
 version = "0.1.0"
 authors = ["konstin <[email protected]>"]
-edition = "2021"
+edition = "2018"
 
 [[bin]]
 name = "cargo"

diff --git a/test-crates/cffi-mixed/Cargo.toml b/test-crates/cffi-mixed/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cffi-mixed"
 version = "0.1.0"
 authors = ["Armin Ronacher <[email protected]>"]
-edition = "2021"
+edition = "2018"
 
 [lib]
 name = "cffi_mixed"

diff --git a/test-crates/cffi-pure/Cargo.toml b/test-crates/cffi-pure/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cffi-pure"
 version = "0.1.0"
 authors = ["Armin Ronacher <[email protected]>"]
-edition = "2021"
+edition = "2018"
 
 [lib]
 name = "cffi_pure"

diff --git a/test-crates/hello-world/Cargo.toml b/test-crates/hello-world/Cargo.toml
@@ -2,7 +2,7 @@
 name = "hello-world"
 version = "0.1.0"
 authors = ["konstin <[email protected]>"]
-edition = "2021"
+edition = "2018"
 # Test references to out-of-project files
 readme = "../../Readme.md"
 

diff --git a/test-crates/lib_with_disallowed_lib/Cargo.toml b/test-crates/lib_with_disallowed_lib/Cargo.toml
@@ -2,7 +2,7 @@
 name = "lib_with_disallowed_lib"
 version = "0.1.0"
 authors = ["messense <[email protected]>"]
-edition = "2021"
+edition = "2018"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/test-crates/lib_with_path_dep/Cargo.toml b/test-crates/lib_with_path_dep/Cargo.toml
@@ -2,7 +2,7 @@
 name = "lib_with_path_dep"
 version = "0.1.0"
 authors = ["konstin <[email protected]>"]
-edition = "2021"
+edition = "2018"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/test-crates/pyo3-abi3-without-version/Cargo.toml b/test-crates/pyo3-abi3-without-version/Cargo.toml
@@ -2,7 +2,7 @@
 name = "pyo3-abi3-without-version"
 version = "0.1.0"
 authors = ["konstin <[email protected]>"]
-edition = "2021"
+edition = "2018"
 
 [dependencies]
 pyo3 = { version = "0.15.1", features = ["abi3", "extension-module"] }

diff --git a/test-crates/pyo3-feature/Cargo.toml b/test-crates/pyo3-feature/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["konstin <[email protected]>"]
 name = "pyo3-feature"
 version = "0.7.3"
-edition = "2021"
+edition = "2018"
 
 [dependencies]
 pyo3 = { version = "0.15.1", optional = true }
diff --git a/test-crates/pyo3-mixed-py-subdir/Cargo.toml b/test-crates/pyo3-mixed-py-subdir/Cargo.toml
@@ -4,7 +4,7 @@ name = "pyo3-mixed-py-subdir"
 version = "2.1.3"
 description = "Implements a dummy function combining rust and python"
 readme = "Readme.md"
-edition = "2021"
+edition = "2018"
 
 [dependencies]
 pyo3 = { version = "0.15.1", features = ["extension-module"] }

diff --git a/test-crates/pyo3-mixed-submodule/Cargo.toml b/test-crates/pyo3-mixed-submodule/Cargo.toml
@@ -4,7 +4,7 @@ name = "pyo3-mixed-submodule"
 version = "2.1.3"
 description = "Implements a dummy function combining rust and python"
 readme = "Readme.md"
-edition = "2021"
+edition = "2018"
 
 [package.metadata.maturin]
 name = "pyo3_mixed_submodule.rust_module.rust"

diff --git a/test-crates/pyo3-mixed/Cargo.toml b/test-crates/pyo3-mixed/Cargo.toml
@@ -4,7 +4,7 @@ name = "pyo3-mixed"
 version = "2.1.3"
 description = "Implements a dummy function combining rust and python"
 readme = "Readme.md"
-edition = "2021"
+edition = "2018"
 
 [dependencies]
 pyo3 = { version = "0.15.1", features = ["extension-module"] }

diff --git a/test-crates/pyo3-no-extension-module/Cargo.toml b/test-crates/pyo3-no-extension-module/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["konstin <[email protected]>"]
 name = "pyo3-no-extension-module"
 version = "2.1.0"
 description = "Does not use the extension-module feature, thus erroneously linking libpython"
-edition = "2021"
+edition = "2018"
 
 [dependencies]
 pyo3 = { version = "0.15.1", default-features = false }

diff --git a/test-crates/pyo3-pure/Cargo.toml b/test-crates/pyo3-pure/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["konstin <[email protected]>"]
 name = "pyo3-pure"
 version = "2.1.2"
-edition = "2021"
+edition = "2018"
 description = "Implements a dummy function (get_fortytwo.DummyClass.get_42()) in rust"
 
 [dependencies]

diff --git a/test-crates/some_path_dep/Cargo.toml b/test-crates/some_path_dep/Cargo.toml
@@ -2,7 +2,7 @@
 name = "some_path_dep"
 version = "0.1.0"
 authors = ["konstin <[email protected]>"]
-edition = "2021"
+edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/test-crates/transitive_path_dep/Cargo.toml b/test-crates/transitive_path_dep/Cargo.toml
@@ -2,7 +2,7 @@
 name = "transitive_path_dep"
 version = "0.1.0"
 authors = ["konstin <[email protected]>"]
-edition = "2021"
+edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/test-crates/workspace/py/Cargo.toml b/test-crates/workspace/py/Cargo.toml
@@ -2,6 +2,6 @@
 name = "py"
 version = "0.1.0"
 authors = ["konstin <[email protected]>"]
-edition = "2021"
+edition = "2018"
 
 [dependencies]