Skip to content

Fix the build with bitflags-1.3.0 and newer#1492

Merged
asomers merged 4 commits intonix-rust:masterfrom
asomers:bitflags_1.3.1
Aug 14, 2021
Merged

Fix the build with bitflags-1.3.0 and newer#1492
asomers merged 4 commits intonix-rust:masterfrom
asomers:bitflags_1.3.1

Conversation

@asomers
Copy link
Copy Markdown
Member

@asomers asomers commented Aug 13, 2021

Bitflags raised its MSRV in a minor version, forcing all consumers to follow suit.

Fixes #1491

asomers added 2 commits August 13, 2021 17:34
@asomers
Fix warnings with Rust 1.46.0 - 1.51.0, inclusive
e9ea844 
These ranges of rustc are pickier about where to place
an #[allow(unused_doc_comments)] attribute.  It caused warnings when
building for BSD-based targets.
@asomers
Fix the build with bitflags-1.3.0 and newer
5495bbc 
Bitflags raised its MSRV in a minor version, forcing all consumers to
follow suit.

Fixes nix-rust#1491
asomers added 2 commits August 13, 2021 17:45
@asomers
constify more functions
7049d42 
Constify more functions, since we're raising the MSRV from 1.41.0 to
1.46.0.

Fixes nix-rust#1477
@asomers
Remove support for 32-bit Apple targets
8acdaef
@asomers asomers merged commit 5ed5bb6 into nix-rust:master Aug 14, 2021
@asomers asomers deleted the bitflags_1.3.1 branch August 14, 2021 00:08
asomers added a commit that referenced this pull request Aug 18, 2021
@asomers
[skip ci] Fix bors configuration
0163528 
* I never removed 32-bit OSX and iOS targets that were removed from
  Cirrus in PR #1492 .
* I never added Fuchsia (PR #1285) .
* I never added illumos (PR #1394) .
* never added Linux x32 (PR #1366) .
@lopopolo
Copy link
Copy Markdown

lopopolo commented Sep 3, 2021

Bitflags raised its MSRV in a minor version, forcing all consumers to follow suit.

Not to be combative, but an alternative way to say this is that nix is holding the ecosystem back from upgrading.

Leaving the existing constraint in place and generating a lockfile with minimal versions would allow applications building with older rustc to continue to compile even in the absence of an already-generated lockfile and allow applications building with newer rustc to use the latest bitflags.

cargo +nightly -Z minimal-versions generate-lockfile

@lopopolo
Copy link
Copy Markdown

lopopolo commented Sep 3, 2021

Oh wow, I did not look at the code in this PR at all, sorry for that!

It looks like this PR does raise the MSRV for nix. I didn't pick that up from either this PR description or the linked ticket.

Sorry. I'm embarrassed.

@asomers
Copy link
Copy Markdown
Member Author

asomers commented Sep 3, 2021

Yes, that's right. Nix raised its MSRV on the master branch, but locked bitflags to < 1.3.0 in the point releases.

pacak added a commit to pacak/nix that referenced this pull request Sep 29, 2021
@pacak
Revert "Merge pull request nix-rust#1492 from asomers/bitflags_1.3.1"
aeb4745 
This reverts commit 5ed5bb6, reversing
changes made to 06b5d33.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

nix doesn't compile with bitflags-1.3.1 on rustc-1.45

2 participants

@asomers @lopopolo
⚡