Skip to content

Commit

Permalink
Merge #1607
Browse files Browse the repository at this point in the history
1607: Relax the bitflags dependency from 1.3.1 to 1.1 r=rtzoeller a=asomers

Fixes #1555

Co-authored-by: Alan Somers <asomers@gmail.com>
  • Loading branch information
bors[bot] and asomers authored Dec 17, 2021
2 parents 5197647 + 178ea09 commit 79ee0a5
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 16 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ This project adheres to [Semantic Versioning](https://semver.org/).

### Added
### Changed

- Relaxed the bitflags requirement from 1.3.1 to 1.1. This partially reverts
#1492. From now on, the MSRV is not guaranteed to work with all versions of
all dependencies, just with some version of all dependencies.
(#[1607](https://github.com/nix-rust/nix/pull/1607))

### Fixed

- Fixed soundness issues in `FdSet::insert`, `FdSet::remove`, and
Expand Down
85 changes: 70 additions & 15 deletions Cargo.lock.msrv

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 @@ -27,7 +27,7 @@ targets = [

[dependencies]
libc = { version = "0.2.102", features = [ "extra_traits" ] }
bitflags = "1.3.1"
bitflags = "1.1"
cfg-if = "1.0"

[target.'cfg(not(target_os = "redox"))'.dependencies]
Expand Down

0 comments on commit 79ee0a5

Please sign in to comment.