diff --git a/Cargo.lock b/Cargo.lock index bc1ad732a..055f5c144 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -68,9 +68,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62e1f47f7dc0422027a4e370dd4548d4d66b26782e513e98dca1e689e058a80e" +checksum = "0a03e93e97a28fbc9f42fbc5ba0886a3c67eb637b476dbee711f80a6ffe8223d" [[package]] name = "async-io" @@ -1452,9 +1452,9 @@ dependencies = [ [[package]] name = "quoted_printable" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1238256b09923649ec89b08104c4dfe9f6cb2fea734a5db5384e44916d59e9c5" +checksum = "3fee2dce59f7a43418e3382c766554c614e06a552d53a8f07ef499ea4b332c0f" [[package]] name = "rand" diff --git a/Cargo.toml b/Cargo.toml index b9d4cc093..85c3d0f4b 100644 --- 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 index 4d3485d9d..69559a41c 100644 --- 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 index 413d2273a..e16e8070e 100644 --- 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 "] -edition = "2021" +edition = "2018" [[bin]] name = "cargo" diff --git a/test-crates/cffi-mixed/Cargo.toml b/test-crates/cffi-mixed/Cargo.toml index 08087cf93..9283c2308 100644 --- 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 "] -edition = "2021" +edition = "2018" [lib] name = "cffi_mixed" diff --git a/test-crates/cffi-pure/Cargo.toml b/test-crates/cffi-pure/Cargo.toml index f1a1ef037..a943fd110 100644 --- 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 "] -edition = "2021" +edition = "2018" [lib] name = "cffi_pure" diff --git a/test-crates/hello-world/Cargo.toml b/test-crates/hello-world/Cargo.toml index 4c6981640..24c281196 100644 --- 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 "] -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 index dcf3459a2..c27723fed 100644 --- 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 "] -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 index ec4f716a7..2d2d184c2 100644 --- 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 "] -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 index d3c3db479..b0695042e 100644 --- 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 "] -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 index c793d6ce9..3de3c2587 100644 --- a/test-crates/pyo3-feature/Cargo.toml +++ b/test-crates/pyo3-feature/Cargo.toml @@ -2,7 +2,7 @@ authors = ["konstin "] 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 index e2fcfb8bf..0083c376d 100644 --- 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 index f08c4e16d..3171faad0 100644 --- 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 index 4ecc06f98..acf7e2cee 100644 --- 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 index 8a1936b2f..42e62d531 100644 --- a/test-crates/pyo3-no-extension-module/Cargo.toml +++ b/test-crates/pyo3-no-extension-module/Cargo.toml @@ -3,7 +3,7 @@ authors = ["konstin "] 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 index 2a7284ab4..6e828b12c 100644 --- a/test-crates/pyo3-pure/Cargo.toml +++ b/test-crates/pyo3-pure/Cargo.toml @@ -2,7 +2,7 @@ authors = ["konstin "] 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 index 8cf04d1f7..43ada6101 100644 --- 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 "] -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 index eaa55599d..dd039bc53 100644 --- 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 "] -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 index 7af564934..a0668fdb7 100644 --- 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 "] -edition = "2021" +edition = "2018" [dependencies]