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.

Sign up for GitHub

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

Bump Rustfmt and RLS #78775

Merged
merged 1 commit into from
Nov 8, 2020
Merged

Bump Rustfmt and RLS #78775

merged 1 commit into from
Nov 8, 2020

Conversation

ghedo
Copy link
Contributor

@ghedo ghedo commented Nov 5, 2020 •
edited by JohnTitor
Loading

Should hopefully fix #78341 and fix #78340.

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • 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 Nov 5, 2020
@ghedo ghedo mentioned this pull request Nov 5, 2020
Closed
@calebcartwright
Copy link
Member

@Mark-Simulacrum - besides addressing the broken toolstate, the rustfmt update also include the bump of the rustc-ap-* crates that contain the changes from #77774 which fixed a panic on the rustfmt side.

I believe #77774 was, ostensibly, backported due to wanting to address that panic issue, so i'm not sure if there's a desire to do something similar here. Probably worth noting we've had a flood of duplicative reports about the same panic issue over in rustfmt.

@Xanewok
Copy link
Member

Xanewok commented Nov 5, 2020

CI says that RLS tests fail but I can't reproduce locally. However, I'm getting a Rustfmt compilation error:

error: this `#[deprecated]` annotation has no effect
   --> src/tools/rustfmt/src/lib.rs:276:1
    |
276 | #[deprecated(note = "Use FormatReportFormatter instead")]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove the unnecessary deprecation attribute
    |
    = note: `#[deny(useless_deprecated)]` on by default

@calebcartwright
Copy link
Member

Wonder if this comes from #78626, as there weren't any related changes on the rustfmt side that would've introduced this

@calebcartwright
Copy link
Member

calebcartwright commented Nov 6, 2020 •
edited
Loading

@Xanewok - I'm going to have to cut a new release to address this, so another PR to RLS will be on it's way to you shortly

@calebcartwright calebcartwright mentioned this pull request Nov 6, 2020
Merged
@calebcartwright
Copy link
Member

@ghedo - would you be willing to update the submods here to pull in the latest changes?

rustfmt should now be on the rustfmt-1.4.24 branch on commit rust-lang/rustfmt@eb894d5 and rls now up to rust-lang/rls@dab1468

@ghedo
Copy link
Contributor Author

ghedo commented Nov 6, 2020

Sure, done. Let's see how it goes 🤞

@Xanewok
Copy link
Member

Xanewok commented Nov 6, 2020

Last hurdle:

the following dependencies are duplicated although they have the same features enabled:
the following dependencies have different features:
  byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)
    `rustfmt` additionally enabled features {} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libbyteorder-c5e2ae63a4128905.rlib"
    `rls` additionally enabled features {"default", "std"} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libbyteorder-286667693f43f34e.rlib"

to fix this you will probably want to edit the local src/tools/rustc-workspace-hack/Cargo.toml crate, as that will update the dependency graph to ensure that these crates all share the same feature set

@rust-log-analyzer
Copy link
Collaborator

The job mingw-check of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
[command]/usr/bin/git submodule foreach --recursive git config --local --name-only --get-regexp 'http\.https\:\/\/github\.com\/\.extraheader' && git config --local --unset-all 'http.https://github.com/.extraheader' || :
[command]/usr/bin/git config --local http.https://github.com/.extraheader AUTHORIZATION: basic ***
##[endgroup]
##[group]Fetching the repository
[command]/usr/bin/git -c protocol.version=2 fetch --no-tags --prune --progress --no-recurse-submodules --depth=2 origin +74e951434536a7980ce81a4e4f8ebfcb127bfbe5:refs/remotes/pull/78775/merge

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

@ghedo
Bump Rustfmt and RLS
bff2e46 
Should hopefully fix #78341 and #78340.
@Mark-Simulacrum Mark-Simulacrum added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 6, 2020
@Mark-Simulacrum
Copy link
Member

beta-nominating per #78775 (comment)

@bors r+

@bors
Copy link
Contributor

bors commented Nov 6, 2020

📌 Commit bff2e46 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-review Status: Awaiting review from the assignee but also interested parties. labels Nov 6, 2020
@Aaron1011
Copy link
Member

This fixes the toolstate.

@bors p=1

@bors
Copy link
Contributor

bors commented Nov 8, 2020

⌛ Testing commit bff2e46 with merge 07684add9321e1f9a1381dee89bb86b3fb689171...

@bors
Copy link
Contributor

bors commented Nov 8, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 8, 2020
@Aaron1011
Copy link
Member

Spurious failure: https://rust-lang.zulipchat.com/#narrow/stream/242791-t-infra/topic/apple-x86_64.20gha.20checks

@bors retry

@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-review Status: Awaiting review from the assignee but also interested parties. labels Nov 8, 2020
@m-ou-se m-ou-se mentioned this pull request Nov 8, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 8, 2020
@bors
Auto merge of rust-lang#78874 - m-ou-se:rollup-3jp1ijj, r=m-ou-se
b1277d0 
Rollup of 19 pull requests

Successful merges:

 - rust-lang#76097 (Stabilize hint::spin_loop)
 - rust-lang#76227 (Stabilize `Poll::is_ready` and `is_pending` as const)
 - rust-lang#78065 (make concurrency helper more pleasant to read)
 - rust-lang#78570 (Remove FIXME comment in print_type_sizes ui test suite)
 - rust-lang#78572 (Use SOCK_CLOEXEC and accept4() on more platforms.)
 - rust-lang#78658 (Add a tool to run `x.py` from any subdirectory)
 - rust-lang#78706 (Fix run-make tests running when LLVM is disabled)
 - rust-lang#78728 (Constantify `UnsafeCell::into_inner` and related)
 - rust-lang#78775 (Bump Rustfmt and RLS)
 - rust-lang#78788 (Correct unsigned equivalent of isize to be usize)
 - rust-lang#78811 (Make some std::io functions `const`)
 - rust-lang#78828 (use single char patterns for split() (clippy::single_char_pattern))
 - rust-lang#78841 (Small cleanup in `TypeFoldable` derive macro)
 - rust-lang#78842 (Honor the rustfmt setting in config.toml)
 - rust-lang#78843 (Less verbose debug logging from inlining integrator)
 - rust-lang#78852 (Convert a bunch of intra-doc links)
 - rust-lang#78860 (rustc_resolve: Use `#![feature(format_args_capture)]`)
 - rust-lang#78861 (typo and formatting)
 - rust-lang#78865 (Don't fire `CONST_ITEM_MUTATION` lint when borrowing a deref)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Nov 8, 2020

⌛ Testing commit bff2e46 with merge b1277d0...

@bors bors merged commit 04859e5 into rust-lang:master Nov 8, 2020
@rustbot rustbot added this to the 1.49.0 milestone Nov 8, 2020
@jyn514 jyn514 mentioned this pull request Nov 11, 2020
Closed
@calebcartwright calebcartwright mentioned this pull request Nov 15, 2020
Merged
@Mark-Simulacrum Mark-Simulacrum added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Nov 15, 2020
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Nov 15, 2020
Merged
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 15, 2020
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.49.0, 1.48.0 Nov 15, 2020
This was referenced Nov 15, 2020
Merged
Merged
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 15, 2020
@bors
Auto merge of rust-lang#79075 - Mark-Simulacrum:beta-next, r=Mark-Sim…
8236dc0 
…ulacrum

[beta] next

This backports:

* Avoid installing external LLVM dylibs rust-lang#78986
* Install CI llvm into the library directory rust-lang#79074
* Revert "Revert "resolve: Avoid "self-confirming" import resolutions in one more case"" rust-lang#78784
* Bump Rustfmt and RLS rust-lang#78775
* Enforce no-move rule of ReentrantMutex using Pin and fix UB in stdio rust-lang#77801

For RLS/rustfmt compilation to succeed:
* change the order of type arguments on ControlFlow rust-lang#76614
* Add ControlFlow::is_{break,continue} methods rust-lang#78200
* Replace run_compiler with RunCompiler builder pattern rust-lang#77649

As a dependency of rust-lang#77801:
*  Add Pin::static_ref, static_mut. rust-lang#77726
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Xanewok Xanewok Xanewok approved these changes

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.48.0
Development

Successfully merging this pull request may close these issues.

rustfmt no longer builds after rust-lang/rust#78334 rls no longer builds after rust-lang/rust#78334
9 participants
@ghedo @rust-highfive @calebcartwright @Xanewok @rust-log-analyzer @Mark-Simulacrum @bors @Aaron1011 @rustbot