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] backports #81151

Merged
merged 24 commits into from
Jan 20, 2021
Merged

[beta] backports #81151

merged 24 commits into from
Jan 20, 2021

Conversation

Mark-Simulacrum
Copy link
Member

This backports:

r? @ghost

@Mark-Simulacrum Mark-Simulacrum self-assigned this Jan 18, 2021
@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Jan 18, 2021

📌 Commit a1edcfbcf55c4aabd67af980370cf6448fcba5b2 has been approved by Mark-Simulacrum

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 18, 2021
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
  SCCACHE_BUCKET: rust-lang-ci-sccache2
  TOOLSTATE_REPO: https://github.com/rust-lang-nursery/rust-toolstate
  CACHE_DOMAIN: ci-caches.rust-lang.org
  EXTRA_VARIABLES: {
 "CI_ONLY_WHEN_SUBMODULES_CHANGED": 1
##[endgroup]
adding extra environment variable CI_ONLY_WHEN_SUBMODULES_CHANGED
linux builder detected, using docker to run the build
##[group]Run src/ci/scripts/should-skip-this.sh
---
   Compiling rustc-ap-rustc_arena v697.0.0
error[E0658]: const generics are unstable
   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rustc-ap-rustc_arena-697.0.0/src/lib.rs:136:15
    |
136 | impl<T, const N: usize> IterExt<T> for std::array::IntoIter<T, N> {
    |
    = note: see issue #74878 <https://github.com/rust-lang/rust/issues/74878> for more information
    = note: see issue #74878 <https://github.com/rust-lang/rust/issues/74878> for more information
    = help: add `#![feature(min_const_generics)]` to the crate attributes to enable
   Compiling proc-macro-error-attr v1.0.4
   Compiling proc-macro-error v1.0.4
error: aborting due to previous error

---
   Compiling heck v0.3.1
error[E0658]: const generics are unstable
   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rustc-ap-rustc_arena-697.0.0/src/lib.rs:136:15
    |
136 | impl<T, const N: usize> IterExt<T> for std::array::IntoIter<T, N> {
    |
    = note: see issue #74878 <https://github.com/rust-lang/rust/issues/74878> for more information
    = note: see issue #74878 <https://github.com/rust-lang/rust/issues/74878> for more information
    = help: add `#![feature(min_const_generics)]` to the crate attributes to enable
   Compiling byteorder v1.3.4
error: aborting due to previous error

For more information about this error, try `rustc --explain E0658`.
---
Verifying status of edition-guide...
Verifying status of rls...
This PR updated 'src/tools/rls', verifying if status is 'test-pass'...

We detected that this PR updated 'rls', but its tests failed.

If you do intend to update 'rls', please check the error messages above and
commit another update.

If you do NOT intend to update 'rls', please ensure you did not accidentally
change the submodule at 'src/tools/rls'. You may ask your reviewer for the
proper steps.
{"rls":"build-fail","reference":"test-pass","cargo-miri":"test-fail","rustbook":"test-fail","edition-guide":"test-pass","nomicon":"test-pass","embedded-book":"test-pass","rustfmt":"build-fail","rust-by-example":"test-pass","book":"test-pass","miri":"test-fail"}failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --stage 2 check-tools

@Mark-Simulacrum
Copy link
Member Author

@bors r-

@Xanewok @calebcartwright it looks like the ap crates are relying on const generics to be stable, but the backports of recent bumps push them back to 1.50 where const generics are not yet stable. This has a number of implications:

  • we can't compile these crates easily, though there may be some hacks I can do in rustbuild to get things to work
  • we are presumably using a const-generics-stable parser, which has stability implications for rustfmt/rls (though not too significant as that feature is already stable in 1.51)

we'll need to resolve this before we can land this, but if it takes more than a few days I'll probably drop those updates from this PR

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 18, 2021
@calebcartwright
Copy link
Member

Might take some juggling but perhaps as an alternative I could backport the commits for the bug fix to the rustfmt-1.4.30 branch in the rustfmt repo. Then rustfmt submod here on beta could stay on the 1.4.30 branch and just pull in the commit, and then do something similar on the RLS maybe in a new branch off whatever's currently in beta?

@Mark-Simulacrum
Copy link
Member Author

That sounds like a good strategy to me.

@calebcartwright
Copy link
Member

Done on the rustfmt side. @Xanewok - let me know if I can do anything to help on the RLS side. Based on what's currently on beta I'm guessing/hoping it's just a matter of bumping the 1.4.29 rustfmt dependency currently in the submod to the now-updated 1.4.30 branch, but not sure if there's anything else on the RLS side that needed to be backported as well

@Xanewok
Copy link
Member

Xanewok commented Jan 19, 2021

Created a https://github.com/rust-lang/rls/tree/rust-1.50 (updates a single commit, starting from https://github.com/rust-lang/rls/tree/2cf84baa5e3c55ac02f42919e67440acb5417125, currently checked out as part of the beta branch) branch that points to the new rustfmt-v1.4.30 branch (updates from 1.4.29), this should be good to go from RLS' side.

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 20, 2021
[beta] update RLS and rustfmt with backported rustfmt fix

Refs rust-lang#81151 (comment)

r? `@Mark-Simulacrum`

cc `@Xanewok`
@bors
Copy link
Contributor

bors commented Jan 20, 2021

☔ The latest upstream changes (presumably #81201) made this pull request unmergeable. Please resolve the merge conflicts.

@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Jan 20, 2021

📌 Commit d239ea6 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 20, 2021
@bors
Copy link
Contributor

bors commented Jan 20, 2021

⌛ Testing commit d239ea6 with merge 1cd0303...

@bors
Copy link
Contributor

bors commented Jan 20, 2021

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 1cd0303 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 20, 2021
@bors bors merged commit 1cd0303 into rust-lang:beta Jan 20, 2021
@rustbot rustbot added this to the 1.50.0 milestone Jan 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants