From 0812d605632b22c4a4364bf0b75522b8466a8367 Mon Sep 17 00:00:00 2001 From: Richard Neumann Date: Tue, 2 Apr 2024 15:48:46 +0200 Subject: [PATCH 1/3] Update bitflags to latest version --- Cargo.toml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index adaf31f0fd..53c889635d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,35 +1,35 @@ [package] -name = "nix" +name = "nix" description = "Rust friendly bindings to *nix APIs" -edition = "2021" -version = "0.28.0" +edition = "2021" +version = "0.28.0" rust-version = "1.69" -authors = ["The nix-rust Project Developers"] -repository = "https://github.com/nix-rust/nix" -license = "MIT" -categories = ["os::unix-apis"] +authors = ["The nix-rust Project Developers"] +repository = "https://github.com/nix-rust/nix" +license = "MIT" +categories = ["os::unix-apis"] include = ["build.rs", "src/**/*", "test/**/*", "LICENSE", "README.md", "CHANGELOG.md"] [package.metadata.docs.rs] all-features = true rustdoc-args = ["--cfg", "docsrs"] targets = [ - "x86_64-unknown-linux-gnu", - "aarch64-linux-android", - "x86_64-apple-darwin", - "aarch64-apple-ios", - "x86_64-unknown-freebsd", - "x86_64-unknown-openbsd", - "x86_64-unknown-netbsd", - "x86_64-unknown-dragonfly", - "x86_64-fuchsia", - "x86_64-unknown-redox", - "x86_64-unknown-illumos" + "x86_64-unknown-linux-gnu", + "aarch64-linux-android", + "x86_64-apple-darwin", + "aarch64-apple-ios", + "x86_64-unknown-freebsd", + "x86_64-unknown-openbsd", + "x86_64-unknown-netbsd", + "x86_64-unknown-dragonfly", + "x86_64-fuchsia", + "x86_64-unknown-redox", + "x86_64-unknown-illumos" ] [dependencies] libc = { version = "0.2.153", features = ["extra_traits"] } -bitflags = "2.3.1" +bitflags = "2.5.0" cfg-if = "1.0" pin-utils = { version = "0.1.0", optional = true } memoffset = { version = "0.9", optional = true } From ded75acd59a007818ca8ae53004c4db21702e632 Mon Sep 17 00:00:00 2001 From: Richard Neumann Date: Tue, 2 Apr 2024 16:04:01 +0200 Subject: [PATCH 2/3] Revert formatting changes by cargo fmt --- Cargo.toml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 53c889635d..f1acb3e385 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,30 +1,30 @@ [package] -name = "nix" +name = "nix" description = "Rust friendly bindings to *nix APIs" -edition = "2021" -version = "0.28.0" +edition = "2021" +version = "0.28.0" rust-version = "1.69" -authors = ["The nix-rust Project Developers"] -repository = "https://github.com/nix-rust/nix" -license = "MIT" -categories = ["os::unix-apis"] +authors = ["The nix-rust Project Developers"] +repository = "https://github.com/nix-rust/nix" +license = "MIT" +categories = ["os::unix-apis"] include = ["build.rs", "src/**/*", "test/**/*", "LICENSE", "README.md", "CHANGELOG.md"] [package.metadata.docs.rs] all-features = true rustdoc-args = ["--cfg", "docsrs"] targets = [ - "x86_64-unknown-linux-gnu", - "aarch64-linux-android", - "x86_64-apple-darwin", - "aarch64-apple-ios", - "x86_64-unknown-freebsd", - "x86_64-unknown-openbsd", - "x86_64-unknown-netbsd", - "x86_64-unknown-dragonfly", - "x86_64-fuchsia", - "x86_64-unknown-redox", - "x86_64-unknown-illumos" + "x86_64-unknown-linux-gnu", + "aarch64-linux-android", + "x86_64-apple-darwin", + "aarch64-apple-ios", + "x86_64-unknown-freebsd", + "x86_64-unknown-openbsd", + "x86_64-unknown-netbsd", + "x86_64-unknown-dragonfly", + "x86_64-fuchsia", + "x86_64-unknown-redox", + "x86_64-unknown-illumos" ] [dependencies] From ebb54f341a93910401393e9586b1ad067cf62515 Mon Sep 17 00:00:00 2001 From: Richard Neumann Date: Tue, 2 Apr 2024 16:04:13 +0200 Subject: [PATCH 3/3] Relax version to 2.3 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index f1acb3e385..f93beb412e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ targets = [ [dependencies] libc = { version = "0.2.153", features = ["extra_traits"] } -bitflags = "2.5.0" +bitflags = "2.3" cfg-if = "1.0" pin-utils = { version = "0.1.0", optional = true } memoffset = { version = "0.9", optional = true }