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.

Sign up for GitHub

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

Jump to bottom

rustfmt: fix build with rustc 1.45.0 #93600

Merged
merged 1 commit into from Jul 21, 2020
Merged

rustfmt: fix build with rustc 1.45.0 #93600

merged 1 commit into from Jul 21, 2020

Conversation

cole-h
Copy link
Member

@cole-h cole-h commented Jul 21, 2020

Due to a recent change in rustc 1.45.0, rustfmt now requires two
additional environment variables to be set in order to build
successfully: CFG_RELEASE and CFG_RELEASE_CHANNEL.

Motivation for this change

#93364 (comment)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

I hope it's alright that this is based against staging-next directly, @vcunat.

@cole-h
rustfmt: fix build with rustc 1.45.0
22fdfc7 
Due to a recent change in rustc 1.45.0, rustfmt now requires two
additional environment variables to be set in order to build
successfully: `CFG_RELEASE` and `CFG_RELEASE_CHANNEL`.
@cole-h cole-h requested review from LnL7 and Mic92 as code owners July 21, 2020 17:35
@cole-h cole-h mentioned this pull request Jul 21, 2020
Merged
10 tasks
@vcunat
Copy link
Member

vcunat commented Jul 21, 2020

It seems to be fixing a regression from master..staging-next, so that would be the right target branch.

@Mic92 Mic92 merged commit e7a68aa into NixOS:staging-next Jul 21, 2020
@cole-h cole-h deleted the fix-rustfmt-1_45_0 branch July 22, 2020 00:21
@cole-h
Copy link
Member Author

cole-h commented Jul 22, 2020

Thanks for the sanity check, @vcunat.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LnL7 LnL7 Awaiting requested review from LnL7

@Mic92 Mic92 Awaiting requested review from Mic92 Mic92 is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@cole-h @vcunat @Mic92