Skip to content

Rustup #10191

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

Merged
merged 12 commits into from
Jan 12, 2023
Merged

Rustup #10191

merged 12 commits into from
Jan 12, 2023

Conversation

flip1995
Copy link
Member

r? @ghost

changelog: none

Noratrieb and others added 11 commits December 28, 2022 18:52
The name makes a lot more sense, and `ty::TyKind` calls it `Ref` already
as well.
Instead of

```
LL |    fn oom(
   |  __^
   | | _|
   | ||
LL | || ) {
   | ||_-
LL | |  }
   | |__^
```

emit

```
LL | // fn oom(
LL | || ) {
   | ||_-
LL | |  }
   | |__^
   ```
Update Clippy

r? `@Manishearth`

I think this was the very first sync with no conflicts whatsoever. I love this time of the year :D
Rollup of 9 pull requests

Successful merges:

 - #104531 (Provide a better error and a suggestion for `Fn` traits with lifetime params)
 - #105899 (`./x doc library --open` opens `std`)
 - #106190 (Account for multiple multiline spans with empty padding)
 - #106202 (Trim more paths in obligation types)
 - #106234 (rustdoc: simplify settings, help, and copy button CSS by not reusing)
 - #106236 (docs/test: add docs and a UI test for `E0514` and `E0519`)
 - #106259 (Update Clippy)
 - #106260 (Fix index out of bounds issues in rustdoc)
 - #106263 (Formatter should not try to format non-Rust files)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Jan 12, 2023
@flip1995
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Jan 12, 2023

📌 Commit 616b6d2 has been approved by flip1995

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jan 12, 2023

⌛ Testing commit 616b6d2 with merge da2c63e...

bors added a commit that referenced this pull request Jan 12, 2023
Rustup

r? `@ghost`

changelog: none
@bors
Copy link
Contributor

bors commented Jan 12, 2023

💔 Test failed - checks-action_test

I'm not sure why this is necessary. It worked without this for me
locally, but this fails in CI. The same was done in clippy_dev
@flip1995
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Jan 12, 2023

📌 Commit cd76d57 has been approved by flip1995

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jan 12, 2023

⌛ Testing commit cd76d57 with merge 0b8ee70...

@Jarcho
Copy link
Contributor

Jarcho commented Jan 12, 2023

Just a heads up @flip1995. I'm in the middle of reverting #9701, can you wait until that before merging back into the rustc repo?

@bors
Copy link
Contributor

bors commented Jan 12, 2023

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: flip1995
Pushing 0b8ee70 to master...

@bors bors merged commit 0b8ee70 into rust-lang:master Jan 12, 2023
@flip1995
Copy link
Member Author

Yes I'll wait for that.

@flip1995 flip1995 deleted the rustup branch January 12, 2023 18:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants