Rollup of 8 pull requests #96685

JohnTitor · 2022-05-03T23:27:27Z

Successful merges:

When suggesting to import an item, also suggest changing the path if appropriate #96353 (When suggesting to import an item, also suggest changing the path if appropriate)
rustdoc: Resolve doc links on fields during early resolution #96447 (rustdoc: Resolve doc links on fields during early resolution)
openbsd: unbreak build on native platform #96597 (openbsd: unbreak build on native platform)
Include nonexported macro_rules! macros in the doctest target #96630 (Include nonexported macro_rules! macros in the doctest target)
Fix typo in lint levels doc #96662 (Fix typo in lint levels doc)
Fix flaky rustdoc-ui test because it did not replace time result #96668 (Fix flaky rustdoc-ui test because it did not replace time result)
Quick fix for #96223. #96679 (Quick fix for ICE: trimmed_def_paths constructed, assertion failed: !new_self_ty.has_escaping_bound_vars() #96223.)
Update ProjectionElem::Downcast documentation #96684 (Update ProjectionElem::Downcast documentation)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

after rust-lang#95612, only linux and windows target are build with -Zunstable-options, but others platforms might use -Csplit-debuginfo add "openbsd" target in the list of platforms using it.

…appropriate When we don't find an item we search all of them for an appropriate import and suggest `use`ing it. This is sometimes done for expressions that have paths with more than one segment. We now also suggest changing that path to work with the `use`. Fix rust-lang#95413

`ProjectionElem:::Downcast` is used when downcasting to a variant of an enum or a generator, regardless of the number of variants.

…rors When suggesting to import an item, also suggest changing the path if appropriate When we don't find an item we search all of them for an appropriate import and suggest `use`ing it. This is sometimes done for expressions that have paths with more than one segment. We now also suggest changing that path to work with the `use`. Fix rust-lang#95413

rustdoc: Resolve doc links on fields during early resolution Another subset of rust-lang#94857 which fixes rust-lang#96429. This case regressed in rust-lang#96135 when `may_have_doc_links`-based filtering was introduced. Before that filtering structs could collect traits in scope for their fields, but after the filtering structs won't collect anything if they don't have doc comments on them, so we have to visit fields too.

…idtwco,Mark-Simulacrum openbsd: unbreak build on native platform after rust-lang#95612, only linux and windows target are build with `-Zunstable-options`, but others platforms might use `-Csplit-debuginfo` currently, without this PR, the build of rustc on OpenBSD fails with: ``` Building stage0 tool unstable-book-gen (x86_64-unknown-openbsd) running: "/data/semarie/build-rust/install_dir/beta/bin/cargo" "build" "--target" "x86_64-unknown-openbsd" "-Zbinary-dep-depinfo" "-j" "4" "-v" "--release" "--frozen" "--manifest-path" "/data/semarie/build-rust/build_dir/rustc-nightly-src/src/tools/unstable-book-gen/Cargo.toml" "--message-format" "json-render-diagnostics" error: failed to run `rustc` to learn about target-specific information Caused by: process didn't exit successfully: `/data/semarie/build-rust/build_dir/build/bootstrap/debug/rustc - --crate-name ___ --print=file-names --cfg=bootstrap -Csymbol-mangling-version=v0 -Zmacro-backtrace -Clink-args=-Wl,-z,origin '-Clink-args=-Wl,-rpath,$ORIGIN/../lib' -Csplit-debuginfo=off -Ztls-model=initial-exec --target x86_64-unknown-openbsd --crate-type bin --crate-type rlib --crate-type dylib --crate-type cdylib --crate-type staticlib --crate-type proc-macro --print=sysroot --print=cfg` (exit status: 1) --- stdout Did not run successfully: exit status: 1 "/data/semarie/build-rust/install_dir/beta/bin/rustc" "-" "--crate-name" "___" "--print=file-names" "--cfg=bootstrap" "-Csymbol-mangling-version=v0" "-Zmacro-backtrace" "-Clink-args=-Wl,-z,origin" "-Clink-args=-Wl,-rpath,$ORIGIN/../lib" "-Csplit-debuginfo=off" "-Ztls-model=initial-exec" "--target" "x86_64-unknown-openbsd" "--crate-type" "bin" "--crate-type" "rlib" "--crate-type" "dylib" "--crate-type" "cdylib" "--crate-type" "staticlib" "--crate-type" "proc-macro" "--print=sysroot" "--print=cfg" "-Wrust_2018_idioms" "-Wunused_lifetimes" "-Wsemicolon_in_expressions_from_macros" "-Dwarnings" "--sysroot" "/data/semarie/build-rust/install_dir/beta" ------------- --- stderr error: `-Csplit-debuginfo` is unstable on this platform command did not execute successfully: "/data/semarie/build-rust/install_dir/beta/bin/cargo.bin" "build" "--target" "x86_64-unknown-openbsd" "-Zbinary-dep-depinfo" "-j" "4" "-v" "--release" "--frozen" "--manifest-path" ``` I am suspecting that all unix might be affected, but I am unsure about the right conditional to use. so I only added "openbsd" target inside it as I am able to test it. rustc nightly built correctly with this PR on openbsd.

Include nonexported macro_rules! macros in the doctest target Fixes rust-lang#88038 This PR aims to include nonexported `macro_rules!` macros in the doctest target. For more details, please see the above issue.

Fix typo in lint levels doc

…-test, r=petrochenkov Fix flaky rustdoc-ui test because it did not replace time result As mentioned in rust-lang#93715: a test is flaky because I forgot to replace the time value. This PR fixes it. r? `@petrochenkov`

…kh726 Quick fix for rust-lang#96223. This PR is a quick fix regarding rust-lang#96223. As mentioned in the issue, others modification could be added to not elide types with bound vars from suggestions. Special thanks to `@jackh726` for mentoring and `@Manishearth` for minimal test case. r? `@jackh726`

Update `ProjectionElem::Downcast` documentation `ProjectionElem:::Downcast` is used when downcasting to a variant of an enum or a generator, regardless of the number of variants.

JohnTitor · 2022-05-03T23:27:55Z

@bors r+ p=5 rollup=never

bors · 2022-05-03T23:27:56Z

📌 Commit 0a18564 has been approved by JohnTitor

bors · 2022-05-04T01:16:22Z

⌛ Testing commit 0a18564 with merge 1bbc6ac42b99f260ec696421965513c4008d334e...

bors · 2022-05-04T01:58:18Z

💔 Test failed - checks-actions

rust-log-analyzer · 2022-05-04T02:06:34Z

The job x86_64-msvc-1 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

test [rustdoc] src/test\rustdoc\wrapping.rs ... ok

failures:

---- [rustdoc] src/test\rustdoc\primitive\no_std.rs stdout ----
thread '[rustdoc] src/test\rustdoc\primitive\no_std.rs' panicked at 'called `Result::unwrap()` on an `Err` value: Os { code: 5, kind: PermissionDenied, message: "Access is denied." }', src\tools\compiletest\src\runtest.rs:2252:34


failures:
    [rustdoc] src/test\rustdoc\primitive\no_std.rs
    [rustdoc] src/test\rustdoc\primitive\no_std.rs

test result: FAILED. 515 passed; 1 failed; 6 ignored; 0 measured; 0 filtered out; finished in 68.25s

Some tests failed in compiletest suite=rustdoc mode=rustdoc host=x86_64-pc-windows-msvc target=x86_64-pc-windows-msvc
Build completed unsuccessfully in 0:35:55
make: *** [Makefile:72: ci-subset-1] Error 1

JohnTitor · 2022-05-04T02:42:39Z

I'm not sure if that failure is spurious or not, we have some rustdoc-related PRs but any PRs don't seem to be related to the failure, hmmm. Closing for now.

petrochenkov and others added 20 commits April 26, 2022 21:36

rustdoc: Resolve doc links on fields during early resolution

6d590ba

openbsd: unbreak build on native platform

6d865f8

after rust-lang#95612, only linux and windows target are build with -Zunstable-options, but others platforms might use -Csplit-debuginfo add "openbsd" target in the list of platforms using it.

remove the special case for nonexported macro_rules! macros

6d8b569

Tweak wording

4934a9e

Fix typo in lint levels doc

77390a1

ignore a doctest for the non-exported macro

3d12fd0

ignore the doctest for map

4698a3f

Fix flaky rustdoc-ui test because it did not replace time result

56c2769

Quick fix for rust-lang#96223.

bfcd191

Taking review hints into account.

574bee3

Update ProjectionElem::Downcast documentation

a63d414

`ProjectionElem:::Downcast` is used when downcasting to a variant of an enum or a generator, regardless of the number of variants.

Rollup merge of rust-lang#96630 - m-ysk:fix/issue-88038, r=notriddle

5c2d31c

Include nonexported macro_rules! macros in the doctest target Fixes rust-lang#88038 This PR aims to include nonexported `macro_rules!` macros in the doctest target. For more details, please see the above issue.

Rollup merge of rust-lang#96662 - rockboynton:master, r=GuillaumeGomez

e55c3f8

Fix typo in lint levels doc

Rollup merge of rust-lang#96684 - tmiasko:mir-downcast, r=petrochenkov

0a18564

Update `ProjectionElem::Downcast` documentation `ProjectionElem:::Downcast` is used when downcasting to a variant of an enum or a generator, regardless of the number of variants.

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 3, 2022

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 May 4, 2022

JohnTitor closed this May 4, 2022

JohnTitor deleted the rollup-ggv1pq0 branch May 4, 2022 02:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #96685

Rollup of 8 pull requests #96685

JohnTitor commented May 3, 2022

JohnTitor commented May 3, 2022

bors commented May 3, 2022

bors commented May 4, 2022

bors commented May 4, 2022

rust-log-analyzer commented May 4, 2022

JohnTitor commented May 4, 2022

Rollup of 8 pull requests #96685

Rollup of 8 pull requests #96685

Conversation

JohnTitor commented May 3, 2022

JohnTitor commented May 3, 2022

bors commented May 3, 2022

bors commented May 4, 2022

bors commented May 4, 2022

rust-log-analyzer commented May 4, 2022

JohnTitor commented May 4, 2022