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.

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

Rollup of 4 pull requests #95760

Merged
merged 8 commits into from
Apr 7, 2022
Merged

Rollup of 4 pull requests #95760

merged 8 commits into from
Apr 7, 2022

Conversation

Dylan-DPC
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

fmease and others added 8 commits April 6, 2022 19:54
Stop flagging unexpected inner attributes as outer ones in certain diagnostics

Fixes rust-lang#94340.

In the issue to-be-fixed I write that the general message _an inner attribute is not permitted in this context_ should be more specific noting that the “context” is the `include` macro. This, however, cannot be achieved without touching a lot of things and passing a flag to the `parse_expr` and `parse_item` calls in `expand_include`. This seems rather hacky to me. That's why I left it as it. `Span::from_expansion` does not apply either AFAIK.

`@rustbot` label A-diagnostics T-compiler
…n-DPC

Regression test for rust-lang#82866

Saw that this issue was open when i was cleaning my old branch for rust-lang#92237.
I am also not opposed to not adding an extra test and just closing rust-lang#82866.

Fixes rust-lang#82866
Correct safety reasoning in `str::make_ascii_{lower,upper}case()`

I don't understand why the previous comment was used (it was inserted in rust-lang#66564), but it doesn't explain why these functions are safe, only why `str::as_bytes{_mut}()` are safe.

If someone thinks they make perfect sense, I'm fine with closing this PR.
Use gender neutral terms

rust-lang#95508 was not executed well, but it did find a couple of legitimate issues: some uses of unnecessarily gendered language, and some typos. This PR fixes (properly) the legitimate issues it found.
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 7, 2022
@Dylan-DPC
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Apr 7, 2022

📌 Commit d907ab8 has been approved by Dylan-DPC

@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 Apr 7, 2022
@bors
Copy link
Collaborator

bors commented Apr 7, 2022

⌛ Testing commit d907ab8 with merge ed6c958...

@bors
Copy link
Collaborator

bors commented Apr 7, 2022

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing ed6c958 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 7, 2022
@bors bors merged commit ed6c958 into rust-lang:master Apr 7, 2022
@rustbot rustbot added this to the 1.62.0 milestone Apr 7, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (ed6c958): comparison url.

Summary: This benchmark run did not return any relevant results.

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

@rustbot label: -perf-regression

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. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants