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.

Sign up for GitHub

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

Jump to bottom

Rollup of 6 pull requests #112111

Closed
wants to merge 22 commits into from
Closed

Rollup of 6 pull requests #112111

wants to merge 22 commits into from

Conversation

Dylan-DPC
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

epage and others added 22 commits March 27, 2023 22:29
@epage
Allow access to OsStr bytes
8d2beb5 
`OsStr` has historically kept its implementation details private out of
concern for locking us into a specific encoding on Windows.

This is an alternative to rust-lang#95290 which proposed specifying the encoding on Windows.  Instead, this
only specifies that for cross-platform code, `OsStr`'s encoding is a superset of UTF-8 and defines
rules for safely interacting with it

At minimum, this can greatly simplify the `os_str_bytes` crate and every
arg parser that interacts with `OsStr` directly (which is most of those
that support invalid UTF-8).
@epage
refactor: Remove redundant, private OsStr::bytes
7f1a6cd
@epage
refactor: Remove bespoke from_os_str_bytes_unchecked
7b92903
@epage
docs: Add examples of OsStr safety violation
f9aaad0
@epage
docs: Clarify OsStr is self-synchronizing
5d177af
@epage
docs: Add missing period
e6a35c4
@sladyn98
Migrate to Askama
5c780d9
@lcnr
unique borrows are mutating uses
cfd0623
@lcnr
add tests
b573250
@lcnr
add FIXME
25f8f4c
@clubby789
offset_of: Don't require type to be sized
6c18d1e
@nnethercote
Remove -Zcgu-partitioning-strategy.
97d4a38 
This option was introduced three years ago, but it's never been
meaningfully used, and `default` is the only acceptable value.

Also, I think the `Partition` trait presents an interface that is too
closely tied to the existing strategy and would probably be wrong for
other strategies. (My rule of thumb is to not make something generic
until there are at least two instances of it, to avoid this kind of
problem.)

Also, I don't think providing multiple partitioning strategies to the
user is a good idea, because the compiler already has enough obscure
knobs.

This commit removes the option, along with the `Partition` trait, and
the `Partitioner` and `DefaultPartitioning` types. I left the existing
code in `compiler/rustc_monomorphize/src/partitioning/default.rs`,
though I could be persuaded that moving it into
`compiler/rustc_monomorphize/src/partitioning/mod.rs` is better.
@nnethercote
Merge default.rs into mod.rs.
66cf072 
Within `compiler/rustc_monomorphize/src/partitioning/`, because the
previous commit removed the need for `default.rs` to be a separate file.
@nnethercote
Rename partitioning/mod.rs as partitioning.rs.
5ed0149 
Because it's now the only file within
`compiler/rustc_monomorphize/src/partitioning/`.
@WaffleLapkin
Better group RFC ui tests together
e3a039d
@WaffleLapkin
Bless tidy root entry limit
b694a03
@Dylan-DPC
Rollup merge of rust-lang#109698 - epage:wtf, r=Amanieu
e898e7c 
Allow limited access to `OsStr` bytes

`OsStr` has historically kept its implementation details private out of
concern for locking us into a specific encoding on Windows.

This is an alternative to rust-lang#95290 which proposed specifying the encoding on Windows.  Instead, this
only specifies that for cross-platform code, `OsStr`'s encoding is a superset of UTF-8 and defines
rules for safely interacting with it

At minimum, this can greatly simplify the `os_str_bytes` crate and every
arg parser that interacts with `OsStr` directly (which is most of those
that support invalid UTF-8).

Tracking issue: rust-lang#111544
@Dylan-DPC
Rollup merge of rust-lang#112031 - sladyn98:migrate-proc-macro, r=Gui…
658bd78 
…llaumeGomez

Migrate  `item_proc_macro` to Askama

This PR migrates `item_proc_macro` to Askama

Refers rust-lang#108868
@Dylan-DPC
Rollup merge of rust-lang#112053 - nnethercote:rm-Zcpu-partitioning-s…
9897757 
…trategy, r=wesleywiser

Remove `-Zcgu-partitioning-strategy`.

This option was introduced three years ago, but it's never been meaningfully used, and `default` is the only acceptable value.

Also, I think the `Partition` trait presents an interface that is too closely tied to the existing strategy and would probably be wrong for other strategies. (My rule of thumb is to not make something generic until there are at least two instances of it, to avoid this kind of problem.)

Also, I don't think providing multiple partitioning strategies to the user is a good idea, because the compiler already has enough obscure knobs.

This commit removes the option, along with the `Partition` trait, and the `Partitioner` and `DefaultPartitioning` types. I left the existing code in `compiler/rustc_monomorphize/src/partitioning/default.rs`, though I could be persuaded that moving it into
`compiler/rustc_monomorphize/src/partitioning/mod.rs` is better.

r? `@wesleywiser`
@Dylan-DPC
Rollup merge of rust-lang#112069 - clubby789:offset-of-sized-fields, …
02d58ab 
…r=WaffleLapkin

offset_of: don't require type to be `Sized`

Fixes rust-lang#112051

~~The RFC [explicitly forbids](https://rust-lang.github.io/rfcs/3308-offset_of.html#limitations) non-`Sized` types, but it looks like only the fields being recursed into were checked. The sized check also seemed to have been completely missing for tuples~~
@Dylan-DPC
Rollup merge of rust-lang#112070 - lcnr:disjoint-closure-capture-ub, …
f00651c 
…r=oli-obk

change `BorrowKind::Unique` to be a mutating `PlaceContext`

fixes rust-lang#112056

I believe that `BorrowKind::Unique` is a footgun in general, so I added a FIXME and opened rust-lang#112072. This is a bit too involved for this PR though.
@Dylan-DPC
Rollup merge of rust-lang#112071 - WaffleLapkin:group-rfcs-tests, r=o…
3b49aa0 
…li-obk

Group rfcs tests

This moves all RFC tests to `tests/ui/rfcs/rfc-NNNN-title-title-title/...`

I had to rename some tests due to conflicts, but otherwise this is just a move.
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels May 30, 2023
@Dylan-DPC
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented May 30, 2023

📌 Commit 3b49aa0 has been approved by Dylan-DPC

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 May 30, 2023
@bors
Copy link
Contributor

bors commented May 30, 2023

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout rollup-9kt7eav (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self rollup-9kt7eav --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message 
Removing tests/ui/rfc-2005-default-binding-mode/slice.rs
Removing tests/ui/rfc-2005-default-binding-mode/lit.rs
Removing tests/ui/rfc-2005-default-binding-mode/for.rs
Removing tests/ui/rfc-2005-default-binding-mode/enum.rs
Auto-merging src/tools/tidy/src/ui_tests.rs
CONFLICT (content): Merge conflict in src/tools/tidy/src/ui_tests.rs
Removing compiler/rustc_monomorphize/src/partitioning/mod.rs
Removing compiler/rustc_monomorphize/src/partitioning/default.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 30, 2023
@Dylan-DPC Dylan-DPC closed this May 31, 2023
@Dylan-DPC Dylan-DPC deleted the rollup-9kt7eav branch May 31, 2023 05:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@Dylan-DPC @bors @rustbot @epage @sladyn98 @lcnr @clubby789 @nnethercote @WaffleLapkin