Rollup of 11 pull requests #84951

Dylan-DPC-zz · 2021-05-05T11:16:56Z

Successful merges:

Implement RFC 2951: Native link modifiers #83507 (Implement RFC 2951: Native link modifiers)
Update ptr docs with regards to ptr::addr_of! #83553 (Update ptr docs with regards to ptr::addr_of!)
Update RELEASES.md for 1.52.0 #84183 (Update RELEASES.md for 1.52.0)
Unify rustc and rustdoc parsing of cfg() #84442 (Unify rustc and rustdoc parsing of cfg())
Fix#84467 linker_args with --target=sparcv9-sun-solaris #84468 (Fix#84467 linker_args with --target=sparcv9-sun-solaris)
Simplify chdir implementation and minimize unsafe block #84712 (Simplify chdir implementation and minimize unsafe block)
Allow using core:: in intra-doc links within core itself #84755 (Allow using core:: in intra-doc links within core itself)
Report coverage 0 of dead blocks #84797 (Report coverage 0 of dead blocks)
Account for unsatisfied bounds in E0599 #84808 (Account for unsatisfied bounds in E0599)
use else if in std library #84843 (use else if in std library )
⬆️ rust-analyzer #84851 (:arrow_up: rust-analyzer)

Failed merges:

Reduce duplication in impl_dep_tracking_hash macros #84803 (Reduce duplication in impl_dep_tracking_hash macros)

r? @ghost
@rustbot modify labels: rollup

I came up with this idea ages ago, but rustdoc used to ICE on it. Now it doesn't.

Moved -z ignore to add_as_needed Trying to cross-compile for sparcv9-sun-solaris getting an error message for -zignore Introduced when -z -ignore was separated here 22d0ab0 No formatting done Reproduce ``` bash rustup target add sparcv9-sun-solaris cargo new --bin hello && cd hello && cargo run --target=sparcv9-sun-solaris ``` config.toml [target.sparcv9-sun-solaris] linker = "gcc"

Fixes: rust-lang#84018 With `-Z instrument-coverage`, coverage reporting of dead blocks (for example, blocks dropped because a conditional branch is dropped, based on const evaluation) is now supported. If `instrument-coverage` is enabled, `simplify::remove_dead_blocks()` finds all dropped coverage `Statement`s and adds their `code_region`s as `Unreachable` coverage `Statement`s to the `START_BLOCK`, so they are still included in the coverage map. Check out the resulting changes in the test coverage reports in this PR.

Fixes: rust-lang#83830

Fix rust-lang#84769, follow up to rust-lang#84499, rust-lang#83667.

Clippy: Decreases indentation and improves readability Signed-off-by: wcampbell <wcampbell1995@gmail.com>

This extracts a new `parse_cfg` function that's used between both. - Treat `#[doc(cfg(x), cfg(y))]` the same as `#[doc(cfg(x)] #[doc(cfg(y))]`. Previously it would be completely ignored. - Treat `#[doc(inline, cfg(x))]` the same as `#[doc(inline)] #[doc(cfg(x))]`. Previously, the cfg would be ignored. - Pass the cfg predicate through to rustc_expand to be validated Co-authored-by: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>

This updates the documentation since `ptr::addr_of!` and `ptr::addr_of_mut!` are now stable. One might remove the distinction between the sections `# On packed structs` and `# Examples`, as the old section on packed structs was primarily to prevent users of doing unde- fined behavior, which is not necessary anymore. There is also a new section in "how to obtain a pointer", which referen- ces the `ptr::addr_of!` macros. This commit contains squashed commits from code review. Co-authored-by: Joshua Nelson <joshua@yottadb.com> Co-authored-by: Mara Bos <m-ou.se@m-ou.se> Co-authored-by: Soveu <marx.tomasz@gmail.com> Co-authored-by: Ralf Jung <post@ralfj.de>

This commit implements both the native linking modifiers infrastructure as well as an initial attempt at the individual modifiers from the RFC. It also introduces a feature flag for the general syntax along with individual feature flags for each modifier.

…trochenkov Implement RFC 2951: Native link modifiers A first attempt at implementing rust-lang/rfcs#2951 / rust-lang/compiler-team#356. Tracking Issue: rust-lang#81490 Introduces feature flags for the general syntax (`native_link_modifiers`) and each modifier (`native_link_modifiers_{as_needed,bundle,verbatim,whole_archive}`). r? `@petrochenkov`

Update `ptr` docs with regards to `ptr::addr_of!` This updates the documentation since `ptr::addr_of!` and `ptr::addr_of_mut!` are now stable. One might remove the distinction between the sections `# On packed structs` and `# Examples`, as the old section on packed structs was primarily to prevent users of doing undefined behavior, which is not necessary anymore. Technically there is now wrong/outdated documentation on stable, but I don't think this is worth a point release 😉 Fixes rust-lang#83509. `````````@rustbot````````` modify labels: T-doc

…albini Update RELEASES.md for 1.52.0 ### [Rendered](https://github.com/rust-lang/rust/blob/relnotes-1.52.0/RELEASES.md) r? ```````@Mark-Simulacrum``````` cc ```````@rust-lang/release```````

Unify rustc and rustdoc parsing of `cfg()` This extracts a new `parse_cfg` function that's used between both. - Treat `#[doc(cfg(x), cfg(y))]` the same as `#[doc(cfg(x)] #[doc(cfg(y))]`. Previously it would be completely ignored. - Treat `#[doc(inline, cfg(x))]` the same as `#[doc(inline)] #[doc(cfg(x))]`. Previously, the cfg would be ignored. - Pass the cfg predicate through to rustc_expand to be validated Technically this is a breaking change, but doc_cfg is still nightly so I don't think it matters. Fixes rust-lang#84437. r? `````@petrochenkov`````

…nkov Fix#84467 linker_args with --target=sparcv9-sun-solaris Trying to cross-compile for sparcv9-sun-solaris getting a error message for -zignore Introduced when -z -ignore was seperated here 22d0ab0 No formatting done Reproduce ``` bash rustup target add sparcv9-sun-solaris cargo new --bin hello && cd hello && cargo run --target=sparcv9-sun-solaris ``` config.toml [target.sparcv9-sun-solaris] linker = "gcc"

Simplify chdir implementation and minimize unsafe block

Allow using `core::` in intra-doc links within core itself I came up with this idea ages ago, but rustdoc used to ICE on it. Now it doesn't. Helps with rust-lang#73445. Doesn't fix it completely since `extern crate self as std;` in std still gives strange errors.

…nts, r=tmandry Report coverage `0` of dead blocks Fixes: rust-lang#84018 With `-Z instrument-coverage`, coverage reporting of dead blocks (for example, blocks dropped because a conditional branch is dropped, based on const evaluation) is now supported. If `instrument-coverage` is enabled, `simplify::remove_dead_blocks()` finds all dropped coverage `Statement`s and adds their `code_region`s as `Unreachable` coverage `Statement`s to the `START_BLOCK`, so they are still included in the coverage map. Check out the resulting changes in the test coverage reports in this PR. I also addressed an outstanding issue/request to move coverage tests from run-make-fulldeps to run-make (in commit 2). Fixes: rust-lang#83830 r? ```````@tmandry``````` cc: ```````@wesleywiser```````

Account for unsatisfied bounds in E0599 Fix rust-lang#84769, follow up to rust-lang#84499, rust-lang#83667.

…olnay use else if in std library Decreases indentation and improves readability

…=jonas-schievink ⬆️ rust-analyzer

Dylan-DPC-zz · 2021-05-05T11:18:14Z

@bors r+ rollup=never p=5

bors · 2021-05-05T11:18:15Z

📌 Commit 427aa73 has been approved by Dylan-DPC

bors · 2021-05-05T14:08:49Z

⌛ Testing commit 427aa73 with merge 3392bc3050df3a35acac0c6f0dd28de63d11b08d...

bors · 2021-05-05T14:15:14Z

💔 Test failed - checks-actions

rust-log-analyzer · 2021-05-05T14:20:39Z

The job dist-i586-gnu-i586-i686-musl failed! Check out the build log: (web) (plain)

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

+ python3 ../x.py --stage 2 test --host= --target i586-unknown-linux-gnu,i686-unknown-linux-musl
    Finished dev [unoptimized + debuginfo] target(s) in 0.18s


failed to execute command: "musl-g++" "-ffunction-sections" "-fdata-sections" "-fPIC" "-m32" "-march=i686" "-Wl,-melf_i386" "-static" "-Wa,-mrelax-relocations=no" "-print-file-name=libstdc++.a"
error: No such file or directory (os error 2)

failed to run: /checkout/obj/build/bootstrap/debug/bootstrap --stage 2 test --host= --target i586-unknown-linux-gnu,i686-unknown-linux-musl
Build completed unsuccessfully in 0:00:00

RalfJung · 2021-05-05T15:42:38Z

Again the musl-g++ error

failed to execute command: "musl-g++" "-ffunction-sections" "-fdata-sections" "-fPIC" "-m32" "-march=i686" "-Wl,-melf_i386" "-static" "-Wa,-mrelax-relocations=no" "-print-file-name=libstdc++.a"
error: No such file or directory (os error 2)

Maybe it's #83507 ? Hm no that was not in the earlier rollups.

RalfJung · 2021-05-05T15:46:23Z

Intersection with #84899, #84924 and #84932:

Update ptr docs with regards to ptr::addr_of! #83553 (Update ptr docs with regards to ptr::addr_of!)
Fix#84467 linker_args with --target=sparcv9-sun-solaris #84468 (Fix#84467 linker_args with --target=sparcv9-sun-solaris)
Report coverage 0 of dead blocks #84797 (Report coverage 0 of dead blocks)
Account for unsatisfied bounds in E0599 #84808 (Account for unsatisfied bounds in E0599)
use else if in std library #84843 (use else if in std library )

RalfJung · 2021-05-05T15:50:55Z

The error seems to happen within 5min; #84948 took almost 30min to fail... so if we exclude the PRs that were in that rollup, the remaining candidates are

Fix#84467 linker_args with --target=sparcv9-sun-solaris #84468 (Fix#84467 linker_args with --target=sparcv9-sun-solaris)
Report coverage 0 of dead blocks #84797 (Report coverage 0 of dead blocks)

klensy · 2021-05-05T15:53:14Z

Maybe #84797 ? Other ones looks unrelated.

RalfJung · 2021-05-05T15:55:04Z

#84797 doesn't touch the linker though... or does it?

ghost · 2021-05-05T16:02:23Z

The error seems coming from here:

rust/src/bootstrap/compile.rs

Line 687 in 24acc38

    
           let file = compiler_file(builder, builder.cxx(target).unwrap(), target, "libstdc++.a");

joshtriplett and others added 23 commits April 29, 2021 13:11

Simplify chdir implementation and minimize unsafe block

8a2e67e

Allow using core:: in intra-doc links within core itself

4a63e1e

I came up with this idea ages ago, but rustdoc used to ICE on it. Now it doesn't.

Move coverage tests from run-make-fulldeps to run-make

3fca198

Fixes: rust-lang#83830

Account for unsatisfied bounds in E0599

1e89b58

Fix rust-lang#84769, follow up to rust-lang#84499, rust-lang#83667.

⬆️ rust-analyzer

367c1db

use else if in std library

2e559c8

Clippy: Decreases indentation and improves readability Signed-off-by: wcampbell <wcampbell1995@gmail.com>

Update RELEASES.md for 1.52.0

b4bfb0e

Rollup merge of rust-lang#84183 - rust-lang:relnotes-1.52.0, r=pietro…

c01cdcf

…albini Update RELEASES.md for 1.52.0 ### [Rendered](https://github.com/rust-lang/rust/blob/relnotes-1.52.0/RELEASES.md) r? ```````@Mark-Simulacrum``````` cc ```````@rust-lang/release```````

Rollup merge of rust-lang#84712 - joshtriplett:simplify-chdir, r=yaahc

ab9c15e

Simplify chdir implementation and minimize unsafe block

Rollup merge of rust-lang#84808 - estebank:issue-84769, r=petrochenkov

bdc7168

Account for unsatisfied bounds in E0599 Fix rust-lang#84769, follow up to rust-lang#84499, rust-lang#83667.

Rollup merge of rust-lang#84843 - wcampbell0x2a:use-else-if-let, r=dt…

47257dd

…olnay use else if in std library Decreases indentation and improves readability

Rollup merge of rust-lang#84851 - lnicola:rust-analyzer-2021-05-03, r…

427aa73

…=jonas-schievink ⬆️ rust-analyzer

rustbot added the rollup A PR which is a rollup label May 5, 2021

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 5, 2021

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 5, 2021

This was referenced May 5, 2021

Fix#84467 linker_args with --target=sparcv9-sun-solaris #84468

Merged

rustbuild: Pass a threads flag that works to windows-gnu lld #84865

Merged

RalfJung mentioned this pull request May 5, 2021

Report coverage 0 of dead blocks #84797

Merged

jackh726 closed this May 5, 2021

Dylan-DPC-zz deleted the rollup-mijzfjm branch May 6, 2021 09:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 11 pull requests #84951

Rollup of 11 pull requests #84951

Dylan-DPC-zz commented May 5, 2021

Dylan-DPC-zz commented May 5, 2021

bors commented May 5, 2021

bors commented May 5, 2021

bors commented May 5, 2021

rust-log-analyzer commented May 5, 2021

RalfJung commented May 5, 2021 •

edited

Loading

RalfJung commented May 5, 2021

RalfJung commented May 5, 2021

klensy commented May 5, 2021

RalfJung commented May 5, 2021

ghost commented May 5, 2021

Rollup of 11 pull requests #84951

Rollup of 11 pull requests #84951

Conversation

Dylan-DPC-zz commented May 5, 2021

Dylan-DPC-zz commented May 5, 2021

bors commented May 5, 2021

bors commented May 5, 2021

bors commented May 5, 2021

rust-log-analyzer commented May 5, 2021

RalfJung commented May 5, 2021 • edited Loading

RalfJung commented May 5, 2021

RalfJung commented May 5, 2021

klensy commented May 5, 2021

RalfJung commented May 5, 2021

ghost commented May 5, 2021

RalfJung commented May 5, 2021 •

edited

Loading