Skip to content

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

lcnr and others added 17 commits October 15, 2021 10:58
This fixes warning when building Rust and running tests:
```
warning: library kind `static-nobundle` has been superseded by specifying `-bundle` on library kind `static`. Try `static:-bundle`
warning: `rustc_llvm` (lib) generated 2 warnings (1 duplicate)
```
The makes the heading / documentation distinction clearer.
Normalize MIR with RevealAll before optimizations.

Fixes rust-lang#78442
Add rustc lint, warning when iterating over hashmaps

r? rust-lang/wg-incr-comp
…ietroalbini

Skip documentation for tier 2 targets on dist-x86_64-apple-darwin

I don't have an easy way to test this locally, but I believe it should work. Based on one log result should shave ~14 minutes off the dist-x86_64-apple builder (doesn't help with aarch64 dist or x86_64 test builder, so not actually decreasing total CI time most likely).

r? `@pietroalbini`
…mez,camelid

Fix alignment of method headings for scannability

We sometimes use indentation to indicate something is a heading: The section that comes after is indented by 24px relative to the heading. However, the relationship between the "Implementations" section heading, the `impl` headings it contains, and the `pub fn` subheadings within each impl, is awkward. It goes **Implementations**, 15px indent, `impl`, 5px indent, `pub fn`, 4px indent, docblock.

I line up `impl` and `pub fn` with the `Implementations` heading, give `impl` a larger font size to indicate it is higher in the hierarchy, and indent the docblock a full 24px relative to their parent, matching the indents we use elsewhere to distinguish section headings. By letting the `pub fn` stick out to the left of the docblock, I think this makes methods significantly more scannable.

Related to rust-lang#59829

r? `@camelid`

[Old](https://doc.rust-lang.org/nightly/std/string/struct.String.html#implementations):

[![image](https://user-images.githubusercontent.com/220205/138380233-9c63a0f2-0f80-40a3-ab3d-a1ee9fb7c5d8.png)](https://doc.rust-lang.org/nightly/std/string/struct.String.html#implementations)

[New](https://jacob.hoffman-andrews.com/rust/outdent-methods/std/string/struct.String.html#implementations):

[![image](https://user-images.githubusercontent.com/220205/138392479-b45fce3f-bf43-42e0-81ee-c4bb9ac35cda.png)](https://jacob.hoffman-andrews.com/rust/outdent-methods/std/string/struct.String.html#implementations)
…petrochenkov

Repace use of `static_nobundle` with `native_link_modifiers` within Rust codebase

This fixes warnings when building Rust and running tests:
```
warning: library kind `static-nobundle` has been superseded by specifying `-bundle` on library kind `static`. Try `static:-bundle`
warning: `rustc_llvm` (lib) generated 2 warnings (1 duplicate)
```
@rustbot rustbot added the rollup A PR which is a rollup label Oct 24, 2021
@matthiaskrgr
Copy link
Member Author

@bors r+ p=5 rollup=never

@bors
Copy link
Collaborator

bors commented Oct 24, 2021

📌 Commit f5e1dd9 has been approved by matthiaskrgr

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 24, 2021
@bors
Copy link
Collaborator

bors commented Oct 24, 2021

⌛ Testing commit f5e1dd9 with merge 84e835883a999bbb8cdebdf750e52cf5cbe823de...

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
warning:                                               ^
warning: 1 warning generated.
[RUSTC-TIMING] profiler_builtins test:false 0.045
 Documenting std v0.0.0 (D:\a\rust\rust\library\std)
thread '<unnamed>' panicked at 'attempt to subtract with overflow', C:\Users\runneradmin\.cargo\registry\src\github.com-1ecc6299db9ec823\rustc-rayon-core-0.3.1\src\sleep\mod.rs:330:21

error: internal compiler error: unexpected panic

error: Unrecognized option: 'markdown-css'
error: Unrecognized option: 'markdown-css'

Rayon: detected unexpected panic; aborting
thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: PoisonError { .. }', C:\Users\runneradmin\.cargo\registry\src\github.com-1ecc6299db9ec823\rustc-rayon-core-0.3.1\src\sleep\mod.rs:183:
error: could not document `std`
Caused by:
Caused by:
  process didn't exit successfully: `D:\a\rust\rust\build\bootstrap/debug/rustdoc --edition=2018 --crate-type dylib --crate-type rlib --crate-name std library\std\src\lib.rs --target x86_64-pc-windows-msvc -o D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-std\x86_64-pc-windows-msvc\doc --cfg "feature=\"addr2line\"" --cfg "feature=\"backtrace\"" --cfg "feature=\"compiler-builtins-c\"" --cfg "feature=\"gimli-symbolize\"" --cfg "feature=\"miniz_oxide\"" --cfg "feature=\"object\"" --cfg "feature=\"panic_unwind\"" --cfg "feature=\"profiler\"" --cfg "feature=\"profiler_builtins\"" --cfg "feature=\"std_detect_dlsym_getauxval\"" --cfg "feature=\"std_detect_file_io\"" --error-format=json --json=diagnostic-rendered-ansi --markdown-css rust.css --markdown-no-toc -Z unstable-options --resource-suffix 1.58.0 --index-page D:\a\rust\rust\src/doc/index.md -L dependency=D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-std\x86_64-pc-windows-msvc\release\deps -L dependency=D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-std\release\deps --extern addr2line=D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-std\x86_64-pc-windows-msvc\release\deps\libaddr2line-cf11887e347bade5.rmeta --extern alloc=D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-std\x86_64-pc-windows-msvc\release\deps\liballoc-b283fed844d10fdc.rmeta --extern cfg_if=D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-std\x86_64-pc-windows-msvc\release\deps\libcfg_if-a1ee9feefed99f72.rmeta --extern compiler_builtins=D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-std\x86_64-pc-windows-msvc\release\deps\libcompiler_builtins-295e6ad7c6062cdb.rmeta --extern core=D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-std\x86_64-pc-windows-msvc\release\deps\libcore-32ff48abea5dad46.rmeta --extern hashbrown=D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-std\x86_64-pc-windows-msvc\release\deps\libhashbrown-9b6df23d5e4e993c.rmeta --extern libc=D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-std\x86_64-pc-windows-msvc\release\deps\liblibc-ab427bbde3411ee2.rmeta --extern miniz_oxide=D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-std\x86_64-pc-windows-msvc\release\deps\libminiz_oxide-080b325d9b90f74f.rmeta --extern object=D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-std\x86_64-pc-windows-msvc\release\deps\libobject-7ac310d5d1dc9671.rmeta --extern panic_abort=D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-std\x86_64-pc-windows-msvc\release\deps\libpanic_abort-6e3b294cc2031538.rmeta --extern panic_unwind=D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-std\x86_64-pc-windows-msvc\release\deps\libpanic_unwind-f1df0c4029384187.rmeta --extern profiler_builtins=D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-std\x86_64-pc-windows-msvc\release\deps\libprofiler_builtins-a15fa0671ead8500.rmeta --extern rustc_demangle=D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-std\x86_64-pc-windows-msvc\release\deps\librustc_demangle-bdaaf91f670914ee.rmeta --extern std_detect=D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-std\x86_64-pc-windows-msvc\release\deps\libstd_detect-418a7e03f8777010.rmeta --extern unwind=D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-std\x86_64-pc-windows-msvc\release\deps\libunwind-bc9e722e7c53e3b5.rmeta -Zsymbol-mangling-version=legacy -Dwarnings -Wrustdoc::invalid_codeblock_attributes --crate-version "1.58.0-nightly
  (84e835883
  2021-10-24)" "-Zcrate-attr=doc(html_root_url=\"https://doc.rust-lang.org/nightly/\")" --cfg backtrace_in_libstd` (exit code: 0xc0000409, STATUS_STACK_BUFFER_OVERRUN)


command did not execute successfully: "\\\\?\\D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustdoc" "--target" "x86_64-pc-windows-msvc" "-Zbinary-dep-depinfo" "-j" "8" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace profiler compiler-builtins-c" "--manifest-path" "D:\\a\\rust\\rust\\library/test/Cargo.toml" "-p" "std" "-Zskip-rustdoc-fingerprint" "--" "--markdown-css" "rust.css" "--markdown-no-toc" "-Z" "unstable-options" "--resource-suffix" "1.58.0" "--index-page" "D:\\a\\rust\\rust\\src/doc/index.md"


Build completed unsuccessfully in 0:45:27
Build completed unsuccessfully in 0:45:27
make: *** [Makefile:74: ci-subset-2] Error 1

@bors
Copy link
Collaborator

bors commented Oct 24, 2021

💔 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 Oct 24, 2021
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 24, 2021
. rust-lang#89776 enabled overflow checks in CI but these lead to two failures already:

rust-lang#90042 (comment)
rust-lang#90222 (comment)

The (first?) problem has been identified: rust-lang#90227

This PR temporarily disables the overflow checks again so we don't have to deal with the "spurious" CI failures until rustc-rayon is fixed.

Zulip discussion: https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/ci.20failed.20with.20.20.22attempt.20to.20subtract.20with.20overflow.22
@matthiaskrgr matthiaskrgr deleted the rollup-7yyxmwg branch November 20, 2021 15:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants