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

Beta: Update cargo, clippy #70105

Closed
wants to merge 1 commit into from

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Mar 18, 2020

cargo

2 commits in bda50510d1daf6e9c53ad6ccf603da6e0fa8103f..3532cf738db005a56d1fe81ade514f380d411360
2020-03-02 18:05:34 +0000 to 2020-03-17 18:41:40 +0000

clippy

1 commits in 329923e..204bb9b
2020-03-04 16:11:40 +0000 to 2020-03-17 10:00:05 -0700

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!
  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 18, 2020
@ehuss
Copy link
Contributor Author

ehuss commented Mar 18, 2020

@Mark-Simulacrum FYI, tidy doesn't seem to work on the beta branch. I'm not sure, does the "dev: 1" line need to be commented out?

@ehuss
Copy link
Contributor Author

ehuss commented Mar 18, 2020

cc @flip1995

@Mark-Simulacrum
Copy link
Member

Which part of tidy? rustfmt should not be checked on the beta branch as we don't want a dependency on nightly rustfmt from beta nor worry about reformatting in backports and such.

The dev: 1 line in stage0.txt should be commented out though, yes, on the beta branch.

@ehuss
Copy link
Contributor Author

ehuss commented Mar 18, 2020

./x.py test tidy fails with ./x.py fmt is not supported on this channel. Tidy implicitly runs rustfmt, and it thinks it is on the "dev" channel due to the check here. But initial_rustfmt is not set, so it fails.

@Mark-Simulacrum
Copy link
Member

Oh, that's a bug (odd that CI didn't catch that though?). We should just skip invoking the formatting, not break when trying to do so.

@ehuss
Copy link
Contributor Author

ehuss commented Mar 18, 2020

I believe it passes CI because it forces the channel to beta (here).

@Mark-Simulacrum
Copy link
Member

Bundled into #70244.

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 22, 2020
…ulacrum

[beta] backport rollup

This backports:
* can_begin_literal_maybe_minus: `true` on `"-"? lit` NTs. rust-lang#70058
* ci: use python from the correct path rust-lang#70116
* Update stdarch submodule rust-lang#70151 (superseding and closing rust-lang#70221)
* Beta: Update cargo, clippy rust-lang#70105 (also closing that beta-targeted PR)

It also switches the bootstrap compiler to download from static.rust-lang.org from dev-static.rust-lang.org.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants