Merge branch 'upgrade-to-rust-2021'

mullvad · Jun 3, 2024 · 56b4835 · 56b4835
2 parents 710cacc + fddc4ca
commit 56b4835
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -17,6 +17,7 @@ jobs:
   build-and-test:
     strategy:
       matrix:
+        # Keep MSRV in sync with rust-version in Cargo.toml as much as possible.
         rust: [stable, beta, nightly, 1.62.0]
     runs-on: macos-latest
     steps:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 ### Changed
 * Upgrade `ipnetwork` dependency from 0.16 to 0.20. This is a breaking change since
   `ipnetwork` is part of the public API.
+* Upgrade crate to Rust 2021 edition.
 
 ### Removed
 * Remove `PoolAddrList::to_palist` from the public API. It should never have been exposed.

diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,8 @@ repository = "https://github.com/mullvad/pfctl-rs"
 readme = "README.md"
 keywords = ["pf", "firewall", "macos", "packet", "filter"]
 categories = ["network-programming", "os", "os::macos-apis", "api-bindings"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.62.0"
 
 [badges]
 travis-ci = { repository = "mullvad/pfctl-rs" }