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

[stable] 1.44.1 release #73238

Merged
merged 6 commits into from
Jun 13, 2020
Merged

[stable] 1.44.1 release #73238

merged 6 commits into from
Jun 13, 2020

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Jun 11, 2020 •
edited
Loading

See release notes for details (or commits).

@Mark-Simulacrum
Copy link
Member Author

Hm so I'm having trouble updating just rustfmt-nightly. AFAICT the lockfile upstream didn't change at all, except for the version, in the submodule bump here. But when I try to update things locally, I get

$ cargo update -p rustfmt-nightly --dry-run
    Updating crates.io index
      Adding ena v0.14.0
      Adding psm v0.1.8
      Adding rustc-ap-arena v659.0.0
      Adding rustc-ap-graphviz v659.0.0
      Adding rustc-ap-rustc_ast v659.0.0
      Adding rustc-ap-rustc_ast_passes v659.0.0
      Adding rustc-ap-rustc_ast_pretty v659.0.0
      Adding rustc-ap-rustc_attr v659.0.0
      Adding rustc-ap-rustc_data_structures v659.0.0
      Adding rustc-ap-rustc_errors v659.0.0
      Adding rustc-ap-rustc_expand v659.0.0
      Adding rustc-ap-rustc_feature v659.0.0
      Adding rustc-ap-rustc_fs_util v659.0.0
      Adding rustc-ap-rustc_index v659.0.0
      Adding rustc-ap-rustc_lexer v659.0.0
      Adding rustc-ap-rustc_macros v659.0.0
      Adding rustc-ap-rustc_parse v659.0.0
      Adding rustc-ap-rustc_session v659.0.0
      Adding rustc-ap-rustc_span v659.0.0
      Adding rustc-ap-rustc_target v659.0.0
      Adding rustc-ap-serialize v659.0.0
      Adding rustfmt-config_proc_macro v0.2.0
    Updating rustfmt-nightly v1.4.14 (/home/mark/Edit/rust-2/src/tools/rustfmt) -> v1.4.16
      Adding rustfmt-nightly v1.4.17
      Adding stacker v0.1.9
warning: not updating lockfile due to dry run

I would expect that to just update rustfmt-nightly. Could someone from the cargo team (@ehuss?) or perhaps in the rustfmt world advise?

@ehuss
Copy link
Contributor

ehuss commented Jun 12, 2020

I don't know why cargo update is misbehaving. It is probably because RLS uses the [patch] table for rustfmt. The following should do as a workaround:

cargo update -p rustfmt-nightly
cargo update -p rustfmt-nightly:1.4.17 --precise 1.4.16

The second call should revert the RLS to the in-tree copy, and undo the mess the first call makes.

@ehuss
Copy link
Contributor

ehuss commented Jun 12, 2020

Filed rust-lang/cargo#8355 for the update issue.

@ehuss ehuss mentioned this pull request Jun 12, 2020
Open
Mark-Simulacrum and others added 3 commits June 12, 2020 10:04
@Mark-Simulacrum
Bump rustfmt to 1.4.16
688c9bd 
This corrects a breaking change where `#[cfg_attr(rustfmt, rustfmt_skip)]`
stopped working in 1.44.0.
@tmiasko @Mark-Simulacrum
Update backtrace-sys crate to 0.1.36
20918cf 
* Fix an off-by-one error in backtrace-sys
* Only explicitly configure debuginfo in rustc-dep-of-std
@tmandry @Mark-Simulacrum
Update backtrace-sys
130e114 
Diff:

- Don't look for old RUSTC_DEBUGINFO vars (rust-lang/backtrace-rs#313)
@Mark-Simulacrum Mark-Simulacrum force-pushed the stable-next branch 2 times, most recently from 19a0fba to dbeda3a Compare June 12, 2020 14:05
@Mark-Simulacrum
Copy link
Member Author

@bors r+ p=1000 rollup=never

Preparing artifacts for release on Thursday next week.

@bors
Copy link
Contributor

bors commented Jun 12, 2020

📌 Commit 7b2237e 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 Jun 12, 2020
@bors
Copy link
Contributor

bors commented Jun 12, 2020

⌛ Testing commit 7b2237e with merge 97f7d1cf031be97311289120e23a8d922de74504...

@bors
Copy link
Contributor

bors commented Jun 12, 2020

💔 Test failed - checks-azure

@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 Jun 12, 2020
@Dylan-DPC-zz
Copy link

@bors retry p=1000

@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 Jun 12, 2020
@bors
Copy link
Contributor

bors commented Jun 12, 2020

⌛ Testing commit 7b2237e with merge 6c252f1223c4fca223e116dceff1cb688f0ce715...

@bors
Copy link
Contributor

bors commented Jun 12, 2020

💔 Test failed - checks-azure

@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 Jun 12, 2020
@Dylan-DPC-zz
Copy link

@bors retry p=999

(just so that it runs automatically if things are fine, and doesn't if the tree remains closed)

@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 Jun 12, 2020
@bors
Copy link
Contributor

bors commented Jun 12, 2020

⌛ Testing commit 7b2237e with merge e66a24895830bdbb6ed3710b206a87e97883b781...

@bors
Copy link
Contributor

bors commented Jun 13, 2020

💔 Test failed - checks-azure

@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 Jun 13, 2020
@ehuss
Copy link
Contributor

ehuss commented Jun 13, 2020

Hm, I should have noticed this will need #73213.

@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never

Thanks! Accepted that PR for beta backport as well.

@bors
Copy link
Contributor

bors commented Jun 13, 2020

📌 Commit 9592e67 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 Jun 13, 2020
@bors
Copy link
Contributor

bors commented Jun 13, 2020

⌛ Testing commit 9592e67 with merge d107792...

@bors
Copy link
Contributor

bors commented Jun 13, 2020

☀️ Test successful - checks-azure
Approved by: Mark-Simulacrum
Pushing d107792 to stable...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 13, 2020
@bors bors merged commit d107792 into rust-lang:stable Jun 13, 2020
@Mark-Simulacrum Mark-Simulacrum deleted the stable-next branch June 13, 2020 20:08
@ryoqun ryoqun mentioned this pull request Jun 15, 2020
Merged
@cuviper cuviper added this to the 1.44 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
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
Milestone
1.44
Development

Successfully merging this pull request may close these issues.
7 participants
@Mark-Simulacrum @ehuss @bors @Dylan-DPC-zz @cuviper @tmiasko @tmandry