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

Update rustfmt #6776

Merged
merged 6 commits into from Aug 6, 2019

Conversation

@christophermaier
Copy link
Contributor

commented Jul 31, 2019

See comments for further details.

@chef-expeditor

This comment has been minimized.

Copy link

commented Jul 31, 2019

Hello christophermaier! Thanks for the pull request!

Here is what will happen next:

  1. Your PR will be reviewed by the maintainers.
  2. If everything looks good, one of them will approve it, and your PR will be merged.

Thank you for contributing!

@christophermaier christophermaier force-pushed the cm/update-rustfmt branch from b223e09 to 01e9f00 Aug 5, 2019
Signed-off-by: Christopher Maier <cmaier@chef.io>
Signed-off-by: Christopher Maier <cmaier@chef.io>
See rust-lang/rustfmt#3581 for background.

Signed-off-by: Christopher Maier <cmaier@chef.io>
See rust-lang/rustfmt#3535 for background

Signed-off-by: Christopher Maier <cmaier@chef.io>
Once you edit `RUSTFMT_VERSION` you can just execute the given
commands directly.

Signed-off-by: Christopher Maier <cmaier@chef.io>
@christophermaier christophermaier force-pushed the cm/update-rustfmt branch 2 times, most recently from fdb1f8c to 1d7af0b Aug 5, 2019
@christophermaier

This comment has been minimized.

Copy link
Contributor Author

commented Aug 6, 2019

Don't merge, pending a bit more investigation / characterization of 1d7af0b

@christophermaier christophermaier force-pushed the cm/update-rustfmt branch 2 times, most recently from cd037bd to 1d7af0b Aug 6, 2019
Some of our tests use nightly Rust to help test for specific
things. The version of Rust used was simply piggybacking on the
version of nightly Rust we use for `rustfmt`, rather than being
specifically managed.

Previously, this wasn't an issue, but with the latest nightly Rust
that works for `rustfmt`, we apparently have a bug around cargo
dealing with crates that have symlinks in them (possibly related to
rust-lang/cargo#5664).

This commit introduces a `RUST_NIGHTLY_VERSION` file to explicitly
manage which version we're using in tests. For now, it also pins back
to the last known good nightly version for testing purposes.

Signed-off-by: Christopher Maier <cmaier@chef.io>
@christophermaier christophermaier force-pushed the cm/update-rustfmt branch from 1d7af0b to e8e9562 Aug 6, 2019
@christophermaier christophermaier merged commit 82f53d7 into master Aug 6, 2019
5 checks passed
5 checks passed
DCO This commit has a DCO Signed-off-by
Details
buildkite/habitat-sh-habitat-master-verify Build #2952 passed (31 minutes, 39 seconds)
Details
buildkite/habitat-sh-habitat-master-website Build #82 passed (50 seconds)
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
expeditor/config-validation Validated your Expeditor config file
Details
@chef-ci chef-ci deleted the cm/update-rustfmt branch Aug 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.