Skip to content

Conversation

@RalfJung
Copy link
Member

@RalfJung RalfJung commented Aug 3, 2022

Fixes #100062 by incorporating dtolnay/anyhow#249

@rust-highfive
Copy link
Contributor

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 3, 2022
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=iffy

@bors
Copy link
Collaborator

bors commented Aug 3, 2022

📌 Commit 2bde0e7 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@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 Aug 3, 2022
@cjgillot
Copy link
Contributor

cjgillot commented Aug 3, 2022

Should the Cargo.lock for rustc_codegen_cranelift be updated too? cc @bjorn3

Meanwhile, this bug is a major pain to contribution.
@bors p=1

@bjorn3
Copy link
Member

bjorn3 commented Aug 3, 2022

Yeah, cg_clif's Cargo.lock should probably be updated too.

@RalfJung
Copy link
Member Author

RalfJung commented Aug 3, 2022

When I do cargo update -p anyhow in compiler/rustc_codegen_cranelift/ it only updates to 1.0.59, to 1.0.60... no idea what's going on, I guess I better don't touch that lockfile.

@bors
Copy link
Collaborator

bors commented Aug 3, 2022

⌛ Testing commit 2bde0e7 with merge 1b57946...

@bors
Copy link
Collaborator

bors commented Aug 3, 2022

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 3, 2022
@bors bors merged commit 1b57946 into rust-lang:master Aug 3, 2022
@rustbot rustbot added this to the 1.64.0 milestone Aug 3, 2022
@RalfJung RalfJung deleted the anyhow branch August 3, 2022 22:17
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (1b57946): comparison url.

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: mixed results
mean1 max count2
Regressions 😿
(primary)
N/A N/A 0
Regressions 😿
(secondary)
3.2% 3.2% 1
Improvements 🎉
(primary)
N/A N/A 0
Improvements 🎉
(secondary)
-2.5% -2.7% 2
All 😿🎉 (primary) N/A N/A 0

Cycles

This benchmark run did not return any relevant results for this metric.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Footnotes

  1. the arithmetic mean of the percent change

  2. number of relevant changes

@bjorn3
Copy link
Member

bjorn3 commented Aug 5, 2022

When I do cargo update -p anyhow in compiler/rustc_codegen_cranelift/ it only updates to 1.0.59, to 1.0.60... no idea what's going on, I guess I better don't touch that lockfile.

1.0.60 has been yanked as it breaks compilation for someone: dtolnay/anyhow#250. That is why cargo didn't update it.

@RalfJung
Copy link
Member Author

RalfJung commented Aug 5, 2022

Ah, interesting. It is working fine here though and fixed our issue... very strange.

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.

./x.py test src/test/ui fails to build compiletest

8 participants