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 rust to 1.29 #6527

Merged
merged 3 commits into from Sep 24, 2018

Conversation

Projects
None yet
2 participants
@illicitonion
Copy link
Contributor

illicitonion commented Sep 19, 2018

  • Adds rust version to cache key
  • Makes clippy run with stable release, and not be allowed to fail
  • Reformat as per rustfmt changes between versions

@illicitonion illicitonion requested a review from stuhood Sep 19, 2018

@stuhood
Copy link
Member

stuhood left a comment

Thanks!

.travis.yml Outdated
@@ -258,7 +258,7 @@ matrix:
- ./build-support/bin/travis-ci.sh -ez

# Rust Clippy on Linux with nightly Rust
- name: &clippy_shard "[ALLOWED TO BE RED] Rust Clippy on Linux with nightly Rust"
- name: "Rust Clippy on Linux with nightly Rust"

This comment has been minimized.

@stuhood

stuhood Sep 19, 2018

Member

Still "nightly Rust"?

Would it be worthwhile to leave this shard as "allowed_failure", and land the clippy changes as a second commit that unbreaks and locks in clippy? Also fine landing here... up to you. But it's hard to differentiate the formatting changes from the clippy changes.

@@ -334,16 +346,14 @@ fn execute(top_match: &clap::ArgMatches) -> Result<(), ExitError> {
// something here, or we don't care. Is that a valid assumption?
fs::StrictGlobMatching::Ignore,
fs::GlobExpansionConjunction::AllMatch,
)?)
.map_err(|e| format!("Error expanding globs: {:?}", e))
)?).map_err(|e| format!("Error expanding globs: {:?}", e))

This comment has been minimized.

@stuhood

stuhood Sep 19, 2018

Member

Oof. Not sure how I feel about this change. Oh well =/

@illicitonion illicitonion force-pushed the twitter:dwagnerhall/rust1.29 branch from 1791e07 to a45dca4 Sep 20, 2018

@illicitonion

This comment has been minimized.

Copy link
Contributor

illicitonion commented Sep 20, 2018

No clippy fixes in here at all. I split this into two commits to show what's version update and what's formatting.

@illicitonion illicitonion force-pushed the twitter:dwagnerhall/rust1.29 branch from a45dca4 to 0736ef6 Sep 24, 2018

illicitonion added some commits Sep 19, 2018

Update rust to 1.29
* Adds rust version to cache key
* Makes clippy run with stable release, and not be allowed to fail
Reformat code as per rustfmt in 1.29
I'm looking forward to rustfmt 1.0 which will promise stability

@illicitonion illicitonion force-pushed the twitter:dwagnerhall/rust1.29 branch from 0736ef6 to 87e99aa Sep 24, 2018

@illicitonion illicitonion merged commit 7bbd390 into pantsbuild:master Sep 24, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@illicitonion illicitonion deleted the twitter:dwagnerhall/rust1.29 branch Sep 24, 2018

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