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

Jump to bottom

rustfmt: use the src as defined by the git submodule in rust #66713

Merged
merged 3 commits into from Aug 19, 2019
Merged

rustfmt: use the src as defined by the git submodule in rust #66713

merged 3 commits into from Aug 19, 2019

Conversation

basvandijk
Copy link
Member

This commit makes sure rustc and rustfmt are compatible by setting
rustfmt's src to the rustfmt git submodule as defined in:

https://github.com/rust-lang/rust/tree/1.36.0/src/tools

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.
Notify maintainers

cc @edolstra is this what you meant in #66681 (comment)?

@basvandijk
rustfmt: use the src as defined by the git submodule in rust
16cb261 
This commit makes sure rustc and rustfmt are compatible by setting
rustfmt's src to the rustfmt git submodule as defined in:

https://github.com/rust-lang/rust/tree/1.36.0/src/tools
@basvandijk
Copy link
Member Author

@GrahamcOfBorg build rustfmt

@ofborg ofborg bot added the 6.topic: rust label Aug 16, 2019
@ofborg ofborg bot requested a review from globin August 16, 2019 11:10
@symphorien symphorien mentioned this pull request Aug 16, 2019
Merged
10 tasks
basvandijk and others added 2 commits August 19, 2019 12:54
@basvandijk @symphorien
rustfmt: make sure to test rustfmt instead of rustc
dc37421 
Co-Authored-By: symphorien <symphorien@users.noreply.github.com>
@basvandijk
rustfmt: enable tests
4e5d4d5
@basvandijk basvandijk merged commit b9c4bef into NixOS:master Aug 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@symphorien symphorien symphorien left review comments

@LnL7 LnL7 Awaiting requested review from LnL7

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

@globin globin Awaiting requested review from globin

Assignees
No one assigned
Labels
6.topic: rust 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@basvandijk @symphorien