Rollup of 18 pull requests #74461

Manishearth · 2020-07-17T21:09:35Z

Successful merges:

Enforce even more the code blocks attributes check through rustdoc #71670 (Enforce even more the code blocks attributes check through rustdoc)
Make some Option methods const #73930 (Make some Option methods const)
Fix MinGW run-make-fulldeps tests #74009 (Fix MinGW run-make-fulldeps tests)
Add Arguments::as_str(). #74056 (Add Arguments::as_str().)
Stop processing unreachable blocks when solving dataflow #74169 (Stop processing unreachable blocks when solving dataflow)
Teach bootstrap about target files vs target triples #74251 (Teach bootstrap about target files vs target triples)
Fix src/test/run-make/static-pie/test-aslr.rs #74288 (Fix src/test/run-make/static-pie/test-aslr.rs)
Use intra-doc links in core::iter module #74300 (Use intra-doc links in core::iter module)
add lazy normalization regression tests #74364 (add lazy normalization regression tests)
Add CSS tidy check #74368 (Add CSS tidy check)
Remove leftover from emscripten fastcomp support #74394 (Remove leftover from emscripten fastcomp support)
Don't assign () to ! MIR locals #74411 (Don't assign () to ! MIR locals)
Use an UTF-8 locale for the linker. #74416 (Use an UTF-8 locale for the linker.)
Move hir::Place to librustc_middle/hir #74424 (Move hir::Place to librustc_middle/hir)
docs: better demonstrate that None values are skipped as many times a… #74428 (docs: better demonstrate that None values are skipped as many times a…)
warn about uninitialized multi-variant enums (invalid_value lint) #74438 (warn about uninitialized multi-variant enums)
Fix Arc::as_ptr docs #74440 (Fix Arc::as_ptr docs)
intra-doc links: resolve modules in the type namespace #74452 (intra-doc links: resolve modules in the type namespace)

Failed merges:

Also adds some debug assertions to prevent API consumers from visiting those basic blocks by accident.

Might be subject to the birthday paradox occasionally, causing spurious failures. Addresses: rust-lang#70740 (review)

This is no longer used since rust-lang#63649

Needed to support rust-lang/project-rfc-2229#7 Currently rustc_typeck depends on rustc_middle for definition TypeckTables, etc. For supporting project-rfc-2229#7, rustc_middle would've to depend on rustc_typeck for Place -- introducing a circular dependcy. This resembles the MIR equivalent of `Place` located in `lbrustc_middle/mir`. Co-authored-by: Aman Arora <[email protected]> Co-authored-by: Jennifer Wills <[email protected]> Co-authored-by: Logan Mosier <[email protected]>

…s needed

Because the old one is harder to read and confuse typing checkers.

As a none-native speaker I stumbled upon this, looked it up and couldn't find a phrase, so I made my own assumption that "in any way" was meant (which is the meaning I would've deduced anyway)

`rustc` allows passing in predefined target triples as well as JSON target specification files. This change allows bootstrap to have the first inkling about those differences. This allows building a cross-compiler for an out-of-tree architecture (even though that compiler won't work for other reasons). Even if no one ever uses this functionality, I think the newtype around the `Interned<String>` improves the readability of the code.

Fix src/test/run-make/static-pie/test-aslr.rs Might be subject to the birthday paradox occasionally, causing spurious failures. Addresses: rust-lang#70740 (review)

Use intra-doc links in core::iter module This will make core::iter doc depend less on std doc.

add lazy normalization regression tests We previously didn't have simple tests which fail if we aren't careful around lazy normalization. We now do.

@Mark-Simulacrum

…rk-Simulacrum Add CSS tidy check r? @Mark-Simulacrum

…r=spastorino Remove leftover from emscripten fastcomp support This is no longer used since rust-lang#63649

@matthewjasper

…hewjasper Don't assign `()` to `!` MIR locals Implements the fix described in rust-lang#73860 (comment). Fixes rust-lang#73860 r? @matthewjasper

…i-obk Use an UTF-8 locale for the linker. Using a `C` locale breaks unicode filenames on Guix, where the linker is wrapped by a Guile program.

@nikomatsakis

…atsakis Move hir::Place to librustc_middle/hir Needed to support rust-lang/project-rfc-2229#7 Currently rustc_typeck depends on rustc_middle for definition TypeckTables, etc. For supporting project-rfc-2229#7, rustc_middle would've to depend on rustc_typeck for Place -- introducing a circular dependency. This resembles the MIR equivalent of `Place` located in `lbrustc_middle/mir`. Separate PR for this move will make the actual PR for using Places to represent captures cleaner/more focused. r? @nikomatsakis @matthewjasper

…onas-schievink docs: better demonstrate that None values are skipped as many times a… …s needed

warn about uninitialized multi-variant enums Fixes rust-lang#73608

Fix Arc::as_ptr docs As a non-native speaker I stumbled upon this, looked it up and couldn't find a phrase, so I made my own assumption that "in any way" was meant (which is the meaning I would've deduced anyway)

intra-doc links: resolve modules in the type namespace Fixes rust-lang#62830 Modules actually live in the type namespace, not all three, and it's not possible to clash a type with a module.

Manishearth · 2020-07-17T21:09:52Z

@rustbot modify labels: +rollup
@bors r+ rollup=never p=5

bors · 2020-07-17T21:09:53Z

📌 Commit c587386 has been approved by Manishearth

bors · 2020-07-17T21:10:20Z

⌛ Testing commit c587386 with merge d3df851...

Manishearth · 2020-07-17T21:52:12Z

@bors treeclosed=5

I'm around

bors · 2020-07-18T00:27:40Z

☀️ Test successful - checks-actions, checks-azure
Approved by: Manishearth
Pushing d3df851 to master...

matthiaskrgr · 2020-07-18T14:39:26Z

Looks like something in here had quite the perf impact https://perf.rust-lang.org/compare.html?start=39d5a61f2e4e237123837f5162cc275c2fd7e625&end=d3df8512d2c2afc6d2e7d8b5b951dd7f2ad77b02&stat=instructions:u

Manishearth · 2020-07-18T16:03:04Z

There are a couple MIR changes, maybe those?

matthiaskrgr · 2020-07-18T16:39:53Z

zulip thread

eddyb · 2020-07-21T07:39:17Z

Update on the perf: the regression was (mostly?) in the linker, from #74416, which #74478 reverted.

eddyb · 2020-07-21T08:30:27Z

Oh and because of the revert was tested, we can measure the impact of this rollup without the big linker regression: https://perf.rust-lang.org/compare.html?start=39d5a61f2e4e237123837f5162cc275c2fd7e625&end=556b0eb41b4273f0dcde2cbc2bc9f53e2c09d688

nnethercote · 2020-07-22T01:34:16Z

Those results shows that the linker regression caused all of the regression. With it removed, the remaining 17 PRs actually gave some small wins, except for two unimportant exceptions:

serde-doc-full: a 4.6% regression, but rustdoc measurements are really new and still bouncing around a lot, so it doesn't matter.
script-servo-2-opt: up to 12% regressions for incremental, but those ones are very noisy due to CGU partitioning, so I'm content to ignore it too.

So, I think we are done here! Thanks to @Mark-Simulacrum and @eddyb for their efforts on this.

a1phyr and others added 30 commits July 1, 2020 18:14

Add feature const_option

e7d9944

Add reachable and friends to mir::traversal module

efe634f

Stop adding unreachable basic blocks to dataflow work queue

698e870

Also adds some debug assertions to prevent API consumers from visiting those basic blocks by accident.

Fix src/test/run-make/static-pie/test-aslr.rs

6b9b2d9

Might be subject to the birthday paradox occasionally, causing spurious failures. Addresses: rust-lang#70740 (review)

add lazy normalization regression tests

5269459

Enforce even more the code blocks attributes check through rustdoc

aabca44

Apply review comments

d70e6e1

Update code to new invalid_codeblock_attributes lint name

3dc8544

Remove leftover from emscripten fastcomp support

4497b9a

This is no longer used since rust-lang#63649

Set "invalid_codeblock_attributes" lint to warning level by default

5f6c079

Don't assign () to ! MIR locals

209991f

Use an UTF-8 locale for the linker.

2ff13d9

docs: better demonstrate that None values are skipped as many times a…

08b4b54

…s needed

Convert whitespaces to tabs

6969b30

Add tidy checks for rustdoc css files

3429ded

Fix tidy issues

83ffd5c

Use intra-doc link on Iterator page

91738d8

Intra doc for iter marker traits

53a1d6f

Intra-doc for DoubleEndIterator

69f43dd

Intra-doc for iter Sum and Product traits

a7f067a

Remove unneeded link for Option

3fb3c0c

Link Some(item)

1a90ba7

Remove code span for impl

67c1e89

Because the old one is harder to read and confuse typing checkers.

Fix Arc::as_ptr docs

8aeecc6

As a none-native speaker I stumbled upon this, looked it up and couldn't find a phrase, so I made my own assumption that "in any way" was meant (which is the meaning I would've deduced anyway)

Deny intra_doc_link_resolution_failure in libcore

5ffdd7c

Add Arguments::as_str().

e73a23f

Add #[inline] to Arguments::as_str().

bc4e33e

Make Arguments::as_str() work for empty format strings.

e17c17a

Manishearth added 12 commits July 17, 2020 14:09

Rollup merge of rust-lang#74288 - haraldh:test_aslr, r=petrochenkov

6b2ccc7

Fix src/test/run-make/static-pie/test-aslr.rs Might be subject to the birthday paradox occasionally, causing spurious failures. Addresses: rust-lang#70740 (review)

Rollup merge of rust-lang#74300 - lzutao:iterator-intra, r=jyn514

c9010d6

Use intra-doc links in core::iter module This will make core::iter doc depend less on std doc.

Rollup merge of rust-lang#74364 - lcnr:lazy-norm-tests, r=nikomatsakis

344b5e0

add lazy normalization regression tests We previously didn't have simple tests which fail if we aren't careful around lazy normalization. We now do.

Rollup merge of rust-lang#74368 - GuillaumeGomez:css-tidy-check, r=Ma…

ef0540b

…rk-Simulacrum Add CSS tidy check r? @Mark-Simulacrum

Rollup merge of rust-lang#74394 - bjorn3:remove_emscripten_leftover, …

105cd4b

…r=spastorino Remove leftover from emscripten fastcomp support This is no longer used since rust-lang#63649

Rollup merge of rust-lang#74411 - jonas-schievink:unbreak-mir, r=matt…

87d01d1

…hewjasper Don't assign `()` to `!` MIR locals Implements the fix described in rust-lang#73860 (comment). Fixes rust-lang#73860 r? @matthewjasper

Rollup merge of rust-lang#74416 - NieDzejkob:linker-locale-utf8, r=ol…

eef22da

…i-obk Use an UTF-8 locale for the linker. Using a `C` locale breaks unicode filenames on Guix, where the linker is wrapped by a Guile program.

Rollup merge of rust-lang#74428 - tshepang:better-filter-map-doc, r=j…

3b7e286

…onas-schievink docs: better demonstrate that None values are skipped as many times a… …s needed

Rollup merge of rust-lang#74438 - RalfJung:uninit-lint, r=davidtwco

cdedae8

warn about uninitialized multi-variant enums Fixes rust-lang#73608

Rollup merge of rust-lang#74440 - Abendstolz:patch-1, r=hanna-kruppe

ff1c53f

Fix Arc::as_ptr docs As a non-native speaker I stumbled upon this, looked it up and couldn't find a phrase, so I made my own assumption that "in any way" was meant (which is the meaning I would've deduced anyway)

Rollup merge of rust-lang#74452 - Manishearth:module-type-ns, r=jyn514

c587386

intra-doc links: resolve modules in the type namespace Fixes rust-lang#62830 Modules actually live in the type namespace, not all three, and it's not possible to clash a type with a module.

rustbot added the rollup A PR which is a rollup label Jul 17, 2020

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 17, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 18, 2020

bors merged commit d3df851 into rust-lang:master Jul 18, 2020

bors mentioned this pull request Jul 18, 2020

Improve defaults in x.py #73964

Merged

Manishearth deleted the rollup-xadbh00 branch July 18, 2020 01:14

cuviper added this to the 1.47.0 milestone May 2, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 18 pull requests #74461

Rollup of 18 pull requests #74461

Manishearth commented Jul 17, 2020

Manishearth commented Jul 17, 2020

bors commented Jul 17, 2020

bors commented Jul 17, 2020

Manishearth commented Jul 17, 2020

bors commented Jul 18, 2020

matthiaskrgr commented Jul 18, 2020

Manishearth commented Jul 18, 2020

matthiaskrgr commented Jul 18, 2020

eddyb commented Jul 21, 2020

eddyb commented Jul 21, 2020

nnethercote commented Jul 22, 2020 •

edited

Loading

Rollup of 18 pull requests #74461

Rollup of 18 pull requests #74461

Conversation

Manishearth commented Jul 17, 2020

Manishearth commented Jul 17, 2020

bors commented Jul 17, 2020

bors commented Jul 17, 2020

Manishearth commented Jul 17, 2020

bors commented Jul 18, 2020

matthiaskrgr commented Jul 18, 2020

Manishearth commented Jul 18, 2020

matthiaskrgr commented Jul 18, 2020

eddyb commented Jul 21, 2020

eddyb commented Jul 21, 2020

nnethercote commented Jul 22, 2020 • edited Loading

nnethercote commented Jul 22, 2020 •

edited

Loading