Rollup of 14 pull requests #109439

Noratrieb · 2023-03-21T11:44:26Z

Successful merges:

Windows: make Command prefer non-verbatim paths #96391 (Windows: make Command prefer non-verbatim paths)
Document Iterator::sum/product for Option/Result #106434 (Document Iterator::sum/product for Option/Result)
Include executed tests in the build metrics (and use a custom test display impl) #108659 (Include executed tests in the build metrics (and use a custom test display impl))
Enforce non-lifetime-binders in supertrait preds are not object safe #108842 (Enforce non-lifetime-binders in supertrait preds are not object safe)
new solver: make all goal evaluation able to be automatically rerun #108896 (new solver: make all goal evaluation able to be automatically rerun )
Add dist.compression-profile option to control compression speed #109124 (Add dist.compression-profile option to control compression speed)
Walk un-shifted nested impl Trait in trait when setting up default trait method assumptions #109240 (Walk un-shifted nested impl Trait in trait when setting up default trait method assumptions)
rustdoc: Cleanup parent module tracking for doc links #109312 (rustdoc: Cleanup parent module tracking for doc links)
fix typo #109385 (fix typo)
add myself to mailmap #109386 (add myself to mailmap)
Custom MIR: Support aggregate expressions #109390 (Custom MIR: Support aggregate expressions)
adapt tests/codegen/vec-shrink-panik for LLVM 17 #109394 (adapt tests/codegen/vec-shrink-panik for LLVM 17)
not *all* retags might be explicit in Runtime MIR #109408 (not all retags might be explicit in Runtime MIR)
Refactor handle_missing_lit. #109415 (Refactor handle_missing_lit.)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

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 <[email protected]>

Keep ids of the documented items themselves, not their parent modules. Parent modules can be retreived from those ids when necessary.

…ction

…trait method assumptions

fix typo

add myself to mailmap CC rust-lang/team#951

Custom MIR: Support aggregate expressions Add support for tuple, array and ADT expressions in custom mir r? ````@oli-obk```` or ````@tmiasko```` or ````@JakobDegen````

adapt tests/codegen/vec-shrink-panik for LLVM 17 After llvm/llvm-project@0d4a709 LLVM now doesn't generate references to panic_cannot_unwind: https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/17978#0186ff55-ca6f-4bc5-b1ec-2622c77d0ed5/744-746 Adapted as suggested by ``@nikic`` on Zulip: https://rust-lang.zulipchat.com/#narrow/stream/187780-t-compiler.2Fwg-llvm/topic/a.20couple.20codegen.20test.20failures.20after.20llvm.200d4a709bb876824a/near/342664944 >Okay, so LLVM now realizes that double panic is not possible, so that's fine.

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``

Noratrieb · 2023-03-21T11:44:41Z

@bors r+ p=5 rollup=never

bors · 2023-03-21T11:44:43Z

📌 Commit a0cb748 has been approved by Nilstrieb

It is now in the queue for this repository.

bors · 2023-03-21T11:45:06Z

⌛ Testing commit a0cb748 with merge 5b07c829edb9d1433560fbd8f229e2cdd427849f...

bors · 2023-03-21T11:50:30Z

💔 Test failed - checks-actions

rust-log-analyzer · 2023-03-21T12:48:16Z

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 · 2023-03-21T13:04:56Z

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

ChrisDenton and others added 30 commits December 2, 2022 14:32

Link to Option/Result for Iterator::sum/product

01d6c04

add the --json flag to compiletest

d7049ca

render compiletest output with render_tests

d2f3806

add support for terse output

f96774b

add a splash of color

f816d3a

record tests in build metrics

9388c8e

add support for benchmarks

b14b355

switch all tests to use render_tests

50b3583

avoid overlapping stderr

ad9a444

do not use render_tests for clippy

f23e205

Behind the scenes Clippy uses compiletest-rs, which doesn't support the --json flag we added to Rust's compiletest.

handle non-json output in stdout

9a1ff1b

change approach to prevent interleaving compiletest message

4958272

fix name of the field containing the ignore reason

3248ab7

switch to termcolor

c015d0d

add dist.compression-profile option to control compression speed

0a1b983

use the best compression profile in CI

4556037

replace usage of evaluate_goal with a new add_goal

ed63201

review nits

ee31e5f

add assert

ea08d3a

add comments

ce14a1e

Co-authored-by: lcnr <[email protected]>

UNACEPTABLE

e06c62c

fix let else unformatting

aa8de17

replace chain with two add_goal

e624ef4

fix bad assertion

9df35a5

move compute_goal and evaluate_x methods to inner module

b85bc19

rustdoc: Cleanup parent module tracking for doc links

f7a9702

Keep ids of the documented items themselves, not their parent modules. Parent modules can be retreived from those ids when necessary.

rustdoc: Factor out some doc link resolution code into a separate fun…

ae47810

…ction

add myself to mailmap

69a82f7

Walk un-shifted nested impl Trait in trait when setting up default …

9f80c75

…trait method assumptions

Noratrieb added 6 commits March 21, 2023 12:44

Rollup merge of rust-lang#109385 - lcnr:typo, r=Dylan-DPC

9408e1c

fix typo

Rollup merge of rust-lang#109386 - aDotInTheVoid:mailmap, r=WaffleLapkin

5e93647

add myself to mailmap CC rust-lang/team#951

Rollup merge of rust-lang#109390 - cbeuw:aggregate-lit, r=oli-obk

d891385

Custom MIR: Support aggregate expressions Add support for tuple, array and ADT expressions in custom mir r? ````@oli-obk```` or ````@tmiasko```` or ````@JakobDegen````

Rollup merge of rust-lang#109415 - nnethercote:refactor-handle_missin…

a0cb748

…g_lit, r=petrochenkov Refactor `handle_missing_lit`. A small code readability improvement. r? ``@petrochenkov``

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 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

Noratrieb mentioned this pull request Mar 21, 2023

rustdoc: Cleanup parent module tracking for doc links #109312

Merged

Noratrieb closed this Mar 21, 2023

Noratrieb deleted the rollup-y5vsqo8 branch March 21, 2023 11:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 14 pull requests #109439

Rollup of 14 pull requests #109439

Noratrieb commented Mar 21, 2023

Noratrieb commented Mar 21, 2023

bors commented Mar 21, 2023

bors commented Mar 21, 2023

bors commented Mar 21, 2023

rust-log-analyzer commented Mar 21, 2023

rust-log-analyzer commented Mar 21, 2023

Rollup of 14 pull requests #109439

Rollup of 14 pull requests #109439

Conversation

Noratrieb commented Mar 21, 2023

Noratrieb commented Mar 21, 2023

bors commented Mar 21, 2023

bors commented Mar 21, 2023

bors commented Mar 21, 2023

rust-log-analyzer commented Mar 21, 2023

rust-log-analyzer commented Mar 21, 2023