Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Rust 2021 edition #655

Merged
merged 1 commit into from
Oct 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "2018"
edition = "2021"

[badges]
travis-ci = { repository = "PyO3/maturin" }
Expand Down
1 change: 1 addition & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Add support for PEP 660 editable installs in [#648](https://github.com/PyO3/maturin/pull/648)
* Publish musllinux_1_1 wheels for maturin in [#651](https://github.com/PyO3/maturin/pull/651)
* Refactor `develop` command to act identical to PEP 660 editable wheels in [#653](https://github.com/PyO3/maturin/pull/653)
* Upgrade to Rust 2021 edition in [#655](https://github.com/PyO3/maturin/pull/655)

## [0.11.5] - 2021-10-13

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ENV PATH /root/.cargo/bin:$PATH
# Use an explicit version to actually install the version we require instead of using the cache
# It would be even cooler to invalidate the cache depending on when the official rust image changes,
# but I don't know how to do that
RUN curl --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain 1.55.0 -y
RUN curl --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain 1.56.0 -y

# Compile dependencies only for build caching
ADD Cargo.toml /maturin/Cargo.toml
Expand Down
2 changes: 1 addition & 1 deletion test-crates/cargo-mock/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "cargo-mock"
version = "0.1.0"
authors = ["konstin <konstin@mailbox.org>"]
edition = "2018"
edition = "2021"

[[bin]]
name = "cargo"
Expand Down
2 changes: 1 addition & 1 deletion test-crates/cffi-mixed/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "cffi-mixed"
version = "0.1.0"
authors = ["Armin Ronacher <armin.ronacher@active-4.com>"]
edition = "2018"
edition = "2021"

[lib]
name = "cffi_mixed"
Expand Down
2 changes: 1 addition & 1 deletion test-crates/cffi-pure/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "cffi-pure"
version = "0.1.0"
authors = ["Armin Ronacher <armin.ronacher@active-4.com>"]
edition = "2018"
edition = "2021"

[lib]
name = "cffi_pure"
Expand Down
2 changes: 1 addition & 1 deletion test-crates/hello-world/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "hello-world"
version = "0.1.0"
authors = ["konstin <konstin@mailbox.org>"]
edition = "2018"
edition = "2021"
# Test references to out-of-project files
readme = "../../Readme.md"

Expand Down
2 changes: 1 addition & 1 deletion test-crates/lib_with_disallowed_lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "lib_with_disallowed_lib"
version = "0.1.0"
authors = ["messense <messense@icloud.com>"]
edition = "2018"
edition = "2021"

[lib]
crate-type = ["cdylib"]
Expand Down
2 changes: 1 addition & 1 deletion test-crates/lib_with_path_dep/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "lib_with_path_dep"
version = "0.1.0"
authors = ["konstin <konstin@mailbox.org>"]
edition = "2018"
edition = "2021"

[lib]
crate-type = ["cdylib"]
Expand Down
2 changes: 1 addition & 1 deletion test-crates/pyo3-abi3-without-version/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "pyo3-abi3-without-version"
version = "0.1.0"
authors = ["konstin <konstin@mailbox.org>"]
edition = "2018"
edition = "2021"

[dependencies]
pyo3 = { version = "0.14.0", features = ["abi3", "extension-module"] }
Expand Down
2 changes: 1 addition & 1 deletion test-crates/pyo3-feature/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
authors = ["konstin <konstin@mailbox.org>"]
name = "pyo3-feature"
version = "0.7.3"
edition = "2018"
edition = "2021"

[dependencies]
pyo3 = { version = "0.14.0", optional = true }
2 changes: 1 addition & 1 deletion test-crates/pyo3-mixed-py-subdir/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "2018"
edition = "2021"

[dependencies]
pyo3 = { version = "0.14.0", features = ["extension-module"] }
Expand Down
2 changes: 1 addition & 1 deletion test-crates/pyo3-mixed-submodule/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "2018"
edition = "2021"

[package.metadata.maturin]
name = "pyo3_mixed_submodule.rust_module.rust"
Expand Down
2 changes: 1 addition & 1 deletion test-crates/pyo3-mixed/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name = "pyo3-mixed"
version = "2.1.3"
description = "Implements a dummy function combining rust and python"
readme = "Readme.md"
edition = "2018"
edition = "2021"

[dependencies]
pyo3 = { version = "0.14.0", features = ["extension-module"] }
Expand Down
2 changes: 1 addition & 1 deletion test-crates/pyo3-no-extension-module/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ authors = ["konstin <konstin@mailbox.org>"]
name = "pyo3-no-extension-module"
version = "2.1.0"
description = "Does not use the extension-module feature, thus errorneously linking libpython"
edition = "2018"
edition = "2021"

[dependencies]
pyo3 = { version = "0.14.0", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion test-crates/pyo3-pure/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
authors = ["konstin <konstin@mailbox.org>"]
name = "pyo3-pure"
version = "2.1.2"
edition = "2018"
edition = "2021"
description = "Implements a dummy function (get_fortytwo.DummyClass.get_42()) in rust"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion test-crates/some_path_dep/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "some_path_dep"
version = "0.1.0"
authors = ["konstin <konstin@mailbox.org>"]
edition = "2018"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
2 changes: 1 addition & 1 deletion test-crates/transitive_path_dep/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "transitive_path_dep"
version = "0.1.0"
authors = ["konstin <konstin@mailbox.org>"]
edition = "2018"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
2 changes: 1 addition & 1 deletion test-crates/workspace/py/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
name = "py"
version = "0.1.0"
authors = ["konstin <konstin@mailbox.org>"]
edition = "2018"
edition = "2021"

[dependencies]