Skip to content

[beta] backports - #129758

Merged
bors merged 6 commits into
rust-lang:betafrom
cuviper:beta-next
Sep 1, 2024
Merged

[beta] backports#129758
bors merged 6 commits into
rust-lang:betafrom
cuviper:beta-next

Conversation

@cuviper

@cuvipercuviper commented Aug 29, 2024•
edited
Loading

Copy link
Copy Markdown
Member

r? cuviper

estebankand others added 2 commits August 29, 2024 12:53
@estebank@cuviper
Emit specific message for time<0.3.35 inference failure
b2a7713
```
error[E0282]: type annotations needed for `Box<_>`
--> ~/.cargo/registry/src/index.crates.io-6f17d22bba15001f/time-0.3.34/src/format_description/parse/mod.rs:83:9
|
83 | let items = format_items
| ^^^^^
...
86 | Ok(items.into())
| ---- type must be known at this point
|
= note: this is an inference error on crate `time` caused by a change in Rust 1.80.0; update `time` to version `>=0.3.35`
```
Partially address rust-lang#127343.
(cherry picked from commit b013a3d)
@saethlin@cuviper
Use a reduced recursion limit in the MIR inliner's cycle breaker
1953a13
(cherry picked from commit 950437a)
@rustbot

rustbot commented Aug 29, 2024

Copy link
Copy Markdown
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!

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Aug 29, 2024
@cuviper

cuviper commented Aug 29, 2024

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never

@bors

bors commented Aug 29, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 6f59312 has been approved by cuviper

It is now in the queue for this repository.

@borsbors 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 29, 2024
@cuviper

cuviper commented Aug 29, 2024

Copy link
Copy Markdown
MemberAuthor

Bumping priority so this can merge before the next branch promotions (~tomorrow).

@bors p=2

@bors

bors commented Aug 30, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 6f59312 with merge d1ae3cc...

bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 30, 2024
@bors
Auto merge ofrust-lang#129758- cuviper:beta-next, r=cuviper
d1ae3cc
[beta] backports
- Emit specific message for `time<0.3.35` inference failure rust-lang#129343
- Use a reduced recursion limit in the MIR inliner's cycle breaker rust-lang#129714
- rustdoc: do not run doctests with invalid langstrings rust-lang#128838
r? cuviper
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors

bors commented Aug 30, 2024

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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 Aug 30, 2024
@cuviper

cuviper commented Aug 30, 2024

Copy link
Copy Markdown
MemberAuthor

@bors retry

@borsbors 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 30, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 30, 2024
@bors
Auto merge ofrust-lang#129758- cuviper:beta-next, r=cuviper
1240644
[beta] backports
- Emit specific message for `time<0.3.35` inference failure rust-lang#129343
- Use a reduced recursion limit in the MIR inliner's cycle breaker rust-lang#129714
- rustdoc: do not run doctests with invalid langstrings rust-lang#128838
r? cuviper
@bors

bors commented Aug 30, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 6f59312 with merge 1240644...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors

bors commented Aug 30, 2024

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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 Aug 30, 2024
@workingjubilee

workingjubilee commented Aug 30, 2024

Copy link
Copy Markdown
Member

@bors retry

@borsbors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 30, 2024
@bors

bors commented Aug 31, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 361a050 has been approved by workingjubilee

It is now in the queue for this repository.

@borsbors 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 Aug 31, 2024
@bors

bors commented Aug 31, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 361a050 with merge 170c7f8...

bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 31, 2024
@bors
Auto merge ofrust-lang#129758- cuviper:beta-next, r=workingjubilee
170c7f8
[beta] backports
- Emit specific message for `time<0.3.35` inference failure rust-lang#129343
- Use a reduced recursion limit in the MIR inliner's cycle breaker rust-lang#129714
- rustdoc: do not run doctests with invalid langstrings rust-lang#128838
r? cuviper
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors

bors commented Aug 31, 2024

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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 Aug 31, 2024
@cuviper

cuviper commented Aug 31, 2024

Copy link
Copy Markdown
MemberAuthor

@bors retry

@borsbors 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 31, 2024
@bors

bors commented Aug 31, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 361a050 with merge a5503d4...

bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 31, 2024
@bors
Auto merge ofrust-lang#129758- cuviper:beta-next, r=workingjubilee
a5503d4
[beta] backports
- Emit specific message for `time<0.3.35` inference failure rust-lang#129343
- Use a reduced recursion limit in the MIR inliner's cycle breaker rust-lang#129714
- rustdoc: do not run doctests with invalid langstrings rust-lang#128838
r? cuviper
@workingjubilee

workingjubilee commented Aug 31, 2024

Copy link
Copy Markdown
Member

It might need 06f49f6 if aarch64 CI keeps failing.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors

bors commented Aug 31, 2024

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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 Aug 31, 2024
@cuviper

cuviper commented Aug 31, 2024

Copy link
Copy Markdown
MemberAuthor

@bors r+

@bors

bors commented Aug 31, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit a4461df has been approved by cuviper

It is now in the queue for this repository.

@borsbors 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 31, 2024
@bors

bors commented Aug 31, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit a4461df with merge 4a101b4...

@bors

bors commented Sep 1, 2024

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing 4a101b4 to beta...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 1, 2024
@bors
bors merged commit 4a101b4 into rust-lang:betaSep 1, 2024
@rustbotrustbot added this to the 1.81.0 milestone Sep 1, 2024
@cuviper
cuviper deleted the beta-next branch September 4, 2024 23:43
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@cuvipercuviper

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-infraRelevant to the infrastructure team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.81.0

Development

Successfully merging this pull request may close these issues.

9 participants

@cuviper@rustbot@bors@rust-log-analyzer@workingjubilee@compiler-errors@estebank@saethlin@notriddle