Skip to content

[staging] rustc: reapply re-erased-regions-are-local patch#225778

Merged
zowoq merged 1 commit intoNixOS:stagingfrom
figsoda:rustc
Apr 11, 2023
Merged

[staging] rustc: reapply re-erased-regions-are-local patch#225778
zowoq merged 1 commit intoNixOS:stagingfrom
figsoda:rustc

Conversation

@figsoda
Copy link
Member

@figsoda figsoda commented Apr 11, 2023

The patch is not in 1.68, and was mistakenly removed

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. label Apr 11, 2023
@figsoda figsoda mentioned this pull request Apr 11, 2023
Merged
12 tasks
@figsoda figsoda changed the title rustc: reapply re-erased-regions-are-local patch [next] rustc: reapply re-erased-regions-are-local patch Apr 11, 2023
@vcunat
Copy link
Member

vcunat commented Apr 11, 2023 •
edited
Loading

Uh, that's around 64k rebuilds :-( As it looks like just a single package is affected in practice, I'd most likely delay this until the next staging iteration.

@figsoda
rustc: reapply re-erased-regions-are-local patch
e995ec3 
The patch is not in 1.68, and was mistakenly removed
@figsoda figsoda marked this pull request as draft April 11, 2023 17:57
@figsoda figsoda changed the base branch from staging-next to staging April 11, 2023 17:57
@figsoda figsoda changed the title [next] rustc: reapply re-erased-regions-are-local patch [staging] rustc: reapply re-erased-regions-are-local patch Apr 11, 2023
@figsoda figsoda marked this pull request as ready for review April 11, 2023 17:57
@vcunat
Copy link
Member

vcunat commented Apr 11, 2023

This does fix build of vector for me.

@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Apr 11, 2023
@zowoq zowoq merged commit b0b2385 into NixOS:staging Apr 11, 2023
@zowoq
Copy link
Contributor

zowoq commented Apr 11, 2023

Sorry, I usually check stuff like this before merging.

@figsoda figsoda deleted the rustc branch April 11, 2023 23:59
@figsoda figsoda mentioned this pull request Apr 24, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mic92 Mic92 Awaiting requested review from Mic92

@zowoq zowoq Awaiting requested review from zowoq

@winterqt winterqt Awaiting requested review from winterqt

Assignees

No one assigned

Labels

6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@figsoda @vcunat @zowoq