Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Apr 11, 2023

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.

@figsoda figsoda mentioned this pull request Apr 11, 2023
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

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.

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.

@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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants