Skip to content

Rollup of 6 pull requests - #88265

Merged
bors merged 30 commits into
rust-lang:masterfrom
m-ou-se:rollup-soymv20
Aug 23, 2021
Merged

Rollup of 6 pull requests#88265
bors merged 30 commits into
rust-lang:masterfrom
m-ou-se:rollup-soymv20

Conversation

@m-ou-se

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

camelidand others added 30 commits August 19, 2021 16:18
…ng, r=m-ou-se
Account for tabs when highlighting multiline code suggestions
Address `'\t'` case in rust-lang#87972.
Before:
![Screen Shot 2021-08-12 at 8 52 27 AM](https://user-images.githubusercontent.com/1606434/129228214-e5cfd203-9aa8-41c7-acd9-ce255ef8a21e.png)
After:
![Screen Shot 2021-08-12 at 8 52 15 AM](https://user-images.githubusercontent.com/1606434/129228236-57c951fc-c8cf-4901-989f-b9b5aa5eebca.png)
…, r=m-ou-se
Clarify some wording in Rust 2021 lint docs
Also added some inline code styling.
…-limit, r=dns2utf8
Greatly improve limitation handling on parallel rustdoc GUI test run
Follow-up of rust-lang#88082.
r? `@dns2utf8`
Fix typos “a”→“an”
Fix typos in comments; found using a regex to find some easy instance of incorrect usage of a vs. an.
While automation was used to find these, every change was checked manually.
Changes in submodules get separate PRs:
* rust-lang/stdarch#1201
* rust-lang/cargo#9821
* rust-lang/miri#1874
* rust-lang/rls#1746
* rust-lang/rust-analyzer#9984
_folks @ rust-analyzer are fast at merging…_
* rust-lang/rust-analyzer#9985
* rust-lang/rust-analyzer#9987
* rust-lang/rust-analyzer#9989
_For `clippy`, I don’t know if the changes should better better be moved to a PR to the original repo._
<hr>
This has some overlap with rust-lang#88226, but neither is a strict superset of the other.
If you want multiple commits, I can split it up; in that case, make sure to suggest a criterion for splitting.
…-macro, r=estebank
Add notes to macro-not-found diagnostics to point out how things with the same name were not a match.
This adds notes like:
```
error: cannot find derive macro `Serialize` in this scope
--> $DIR/issue-88206.rs:22:10
|
LL | #[derive(Serialize)]
| ^^^^^^^^^
|
note: `Serialize` is imported here, but it is not a derive macro
--> $DIR/issue-88206.rs:17:11
|
LL | use hey::{Serialize, Deserialize};
| ^^^^^^^^^
```
Fixesrust-lang#88206
Includes rust-lang#88229
r? `@estebank`
…eck, r=oli-obk
Do not mark `-Z thir-unsafeck` as unsound anymore
The initial implementation of the THIR unsafety checker is now complete (rust-lang/project-thir-unsafeck#7).
r? `@oli-obk`
@rustbotrustbot added the rollup A PR which is a rollup label Aug 23, 2021
@m-ou-se

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=6 rollup=never

@bors

bors commented Aug 23, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit e710132 has been approved by m-ou-se

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 23, 2021
@bors

bors commented Aug 23, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e710132 with merge a49e38e...

@bors

bors commented Aug 23, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: m-ou-se
Pushing a49e38e to master...

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: 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.

8 participants

@m-ou-se@bors@rustbot@camelid@steffahn@estebank@GuillaumeGomez@LeSeulArtichaut