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 14 pull requests #109439

Closed
wants to merge 55 commits into from
Closed

Conversation

Nilstrieb
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ChrisDenton and others added 30 commits December 2, 2022 14:32
When spawning Commands, the path we use can end up being queried using `env::current_exe` (or the equivalent in other languages). Not all applications handle these paths properly therefore we should have a stronger preference for non-verbatim paths when spawning processes.
Behind the scenes Clippy uses compiletest-rs, which doesn't support the
--json flag we added to Rust's compiletest.
Co-authored-by: lcnr <rust@lcnr.de>
Keep ids of the documented items themselves, not their parent modules.
Parent modules can be retreived from those ids when necessary.
Custom MIR: Support aggregate expressions

Add support for tuple, array and ADT expressions in custom mir

r? ````@oli-obk```` or ````@tmiasko```` or ````@JakobDegen````
not *all* retags might be explicit in Runtime MIR

In rust-lang#105317 I made Miri treat `Rvalue::Ref/AddrOf` as implicit retagging sites. This updates the MIR docs accordingly.

For `Rvalue::Ref` I think this makes a lot more sense: creating a new reference is their entire point, so we can avoid bloating the MIR with retags. Also this seems to be the best way to handle cases like `*ptr = &[mut] ...`, where doing a retag is somewhat questionable since maybe `*ptr` points to another place now?

For `Rvalue::AddrOf`, Stacked Borrows needs this because even raw ptrs need some retagging, but Tree Borrows doesn't do ant retagging here and I hope we'll end up with a model where raw pointers don't get retagged.
…g_lit, r=petrochenkov

Refactor `handle_missing_lit`.

A small code readability improvement.

r? ``@petrochenkov``
@rustbot rustbot added A-meta Area: Issues about the rust-lang/rust repository. 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-infra Relevant to the infrastructure 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative rollup A PR which is a rollup labels Mar 21, 2023
@Nilstrieb
Copy link
Member Author

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Mar 21, 2023

📌 Commit a0cb748 has been approved by Nilstrieb

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 Mar 21, 2023
@bors
Copy link
Contributor

bors commented Mar 21, 2023

⌛ Testing commit a0cb748 with merge 5b07c829edb9d1433560fbd8f229e2cdd427849f...

@bors
Copy link
Contributor

bors commented Mar 21, 2023

💔 Test failed - checks-actions

@bors bors 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 Mar 21, 2023
@Nilstrieb Nilstrieb closed this Mar 21, 2023
@Nilstrieb Nilstrieb deleted the rollup-y5vsqo8 branch March 21, 2023 11:57
@rust-log-analyzer
Copy link
Collaborator

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
    Checking rustdoc v0.0.0 (/checkout/src/librustdoc)
error[E0061]: this function takes 3 arguments but 4 arguments were supplied
    --> src/librustdoc/clean/mod.rs:2392:29
     |
2392 |         let (attrs, cfg) =  merge_attrs(cx, import_parent, &target_attrs, Some(&import_attrs));
     |                             ^^^^^^^^^^^     ------------- unexpected argument of type `std::option::Option<rustc_span::def_id::DefId>`
     |
note: expected `Option<(&[Attribute], Option<...>)>`, found `Option<&Vec<Attribute>>`
    --> src/librustdoc/clean/mod.rs:2392:75
     |
2392 |         let (attrs, cfg) =  merge_attrs(cx, import_parent, &target_attrs, Some(&import_attrs));
     |                                                                           ^^^^^^^^^^^^^^^^^^^
     = note: expected enum `std::option::Option<(&[Attribute], std::option::Option<rustc_span::def_id::DefId>)>`
                found enum `std::option::Option<&Vec<Attribute>>`
    --> src/librustdoc/clean/inline.rs:322:15
     |
322  | pub(crate) fn merge_attrs(
     |               ^^^^^^^^^^^
     |               ^^^^^^^^^^^
323  |     cx: &mut DocContext<'_>,
     |     -----------------------
324  |     old_attrs: &[ast::Attribute],
     |     ----------------------------
325  |     new_attrs: Option<(&[ast::Attribute], Option<DefId>)>,
help: remove the extra argument
     |
     |
2392 -         let (attrs, cfg) =  merge_attrs(cx, import_parent, &target_attrs, Some(&import_attrs));
2392 +         let (attrs, cfg) =  merge_attrs(cx, &target_attrs, /* std::option::Option<(&[Attribute], std::option::Option<rustc_span::def_id::DefId>)> */);

For more information about this error, try `rustc --explain E0061`.
[RUSTC-TIMING] rustdoc test:false 1.534
error: could not compile `rustdoc` due to previous error

@rust-log-analyzer
Copy link
Collaborator

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
    Checking rustdoc v0.0.0 (/checkout/src/librustdoc)
error[E0061]: this function takes 3 arguments but 4 arguments were supplied
    --> src/librustdoc/clean/mod.rs:2392:29
     |
2392 |         let (attrs, cfg) =  merge_attrs(cx, import_parent, &target_attrs, Some(&import_attrs));
     |                             ^^^^^^^^^^^     ------------- unexpected argument of type `std::option::Option<rustc_span::def_id::DefId>`
     |
note: expected `Option<(&[Attribute], Option<...>)>`, found `Option<&Vec<Attribute>>`
    --> src/librustdoc/clean/mod.rs:2392:75
     |
2392 |         let (attrs, cfg) =  merge_attrs(cx, import_parent, &target_attrs, Some(&import_attrs));
     |                                                                           ^^^^^^^^^^^^^^^^^^^
     = note: expected enum `std::option::Option<(&[Attribute], std::option::Option<rustc_span::def_id::DefId>)>`
                found enum `std::option::Option<&Vec<Attribute>>`
    --> src/librustdoc/clean/inline.rs:322:15
     |
322  | pub(crate) fn merge_attrs(
     |               ^^^^^^^^^^^
     |               ^^^^^^^^^^^
323  |     cx: &mut DocContext<'_>,
     |     -----------------------
324  |     old_attrs: &[ast::Attribute],
     |     ----------------------------
325  |     new_attrs: Option<(&[ast::Attribute], Option<DefId>)>,
help: remove the extra argument
     |
     |
2392 -         let (attrs, cfg) =  merge_attrs(cx, import_parent, &target_attrs, Some(&import_attrs));
2392 +         let (attrs, cfg) =  merge_attrs(cx, &target_attrs, /* std::option::Option<(&[Attribute], std::option::Option<rustc_span::def_id::DefId>)> */);

For more information about this error, try `rustc --explain E0061`.
error: could not compile `rustdoc` due to previous error
Build completed unsuccessfully in 0:01:22

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues about the rust-lang/rust repository. A-testsuite Area: The testsuite used to check the correctness of rustc rollup A PR which is a rollup 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-infra Relevant to the infrastructure 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet