Rollup of 11 pull requests #74312

Manishearth · 2020-07-14T03:30:25Z

Successful merges:

Update RELEASES.md for 1.45.0 #73354 (Update RELEASES.md for 1.45.0)
rustdoc: insert newlines between attributes #73852 (rustdoc: insert newlines between attributes)
Document the union keyword #73867 (Document the union keyword)
Fix caching issue when building tools. #74046 (Fix caching issue when building tools.)
clean up E0718 explanation #74123 (clean up E0718 explanation)
rustdoc: Allow linking from private items to private types #74147 (rustdoc: Allow linking from private items to private types)
Detect tuple struct incorrectly used as struct pat #74173 (Detect tuple struct incorrectly used as struct pat)
Update llvm-project to latest origin/rustc/10.0-2020-05-05 commit #74239 (Update llvm-project to latest origin/rustc/10.0-2020-05-05 commit )
typeck: report placeholder type error w/out span #74270 (typeck: report placeholder type error w/out span)
#71669: add ui, codegen tests for volatile + nearby int intrinsics #74285 (Missing tests for intrinsics. #71669: add ui, codegen tests for volatile + nearby int intrinsics)
Added detailed error code explanation for issue E0688 in Rust compiler. #74286 (Added detailed error code explanation for issue E0688 in Rust compiler.)

Failed merges:

Co-authored-by: Josh Triplett <josh@joshtriplett.org>

Fixes rust-lang#74134 After PR rust-lang#72771 this would trigger an intra_doc_link_resolution_failure warning when rustdoc is invoked without --document-private-items. Links from private items to private types are however never actually generated in that case and thus shouldn't produce a warning. These links are in fact a very useful tool to document crate internals. Tests are added for all 4 combinations of public/private items and link targets. Test 1 is the case mentioned above and fails without this commit. Tests 2 - 4 passed before already but are added nonetheless to prevent regressions.

As per the discussion in PR rust-lang#74147, the 4 individual tests are replaced by a single one. The test is expanded to cover all 4 public/private cases, each with and without --document-private-items.

This commit fixes a regression introduced in rust-lang#70369 which meant that an error was not being emitted for invalid placeholder types when there wasn't a span available. Signed-off-by: David Wood <david@davidtw.co>

…ch includes LVI segfault fix

@Mark-Simulacrum

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

…llaumeGomez rustdoc: insert newlines between attributes Fixes rust-lang#73205.

@rustbot

…riplett Document the union keyword Partial fix of rust-lang#34601. This documents the `union` keyword by presenting three cases: simply using a union, matching on a union and referencing the fields of a union. @rustbot modify labels: T-doc,C-enhancement

…-Simulacrum Fix caching issue when building tools. This fixes a problem with tool builds not being cached properly. rust-lang#73297 changed it so that Clippy will participate in the "deny warnings" setting. Unfortunately this causes a problem because Clippy shares the build directory with other tools which do not participate in "deny warnings". Because Cargo does not independently cache artifacts based on different RUSTFLAGS settings, it causes all the shared dependencies to get rebuilt if Clippy ever gets built. The solution here is to stop using RUSTFLAGS, and just sneak the settings in through the rustc wrapper. Cargo won't know about the different settings, so it will not bust the cache. This should be safe since lint settings on dependencies are ignored. This is how things used to work in the past before rust-lang#64316. Alternate solutions: * Treat Clippy as a "submodule" and don't enforce warnings on it. This was the behavior before rust-lang#73297. The consequence is that if a warning sneaks into clippy, that the clippy maintainers will need to fix it when they sync clippy back to the clippy repo. * Just deny warnings on all tools (removing the in-tree/submodule distinction). This is tempting, but with some issues (cc rust-lang#52336): * Adding or changing warnings in rustc can be difficult to land because tools have to be updated if they trip the warning. In practice, this isn't too bad. Cargo (and rustfmt) already runs with `deny(warnings)`, so this has been the de-facto standard already (although they do not use the extra lints like `unused_lifetimes`). * Teach Cargo to add flags to the workspace members, but not dependencies. * Teach Cargo to add flags without fingerprinting them? * Teach Cargo to independently cache different RUSTFLAGS artifacts (this was [reverted](rust-lang/cargo#7417) due to complications). This would also unnecessarily rebuild dependencies, but would avoid cache thrashing. * Teach Cargo about lint settings. Closes rust-lang#74016

@Dylan-DPC

…kfire clean up E0718 explanation r? @Dylan-DPC

…jyn514 rustdoc: Allow linking from private items to private types Fixes rust-lang#74134 After PR rust-lang#72771 this would trigger an intra_doc_link_resolution_failure warning when rustdoc is invoked without --document-private-items. Links from private items to private types are however never actually generated in that case and thus shouldn't produce a warning. These links are in fact a very useful tool to document crate internals. Tests are added for all 4 combinations of public/private items and link targets. Test 1 is the case mentioned above and fails without this commit. Tests 2 - 4 passed before already but are added nonetheless to prevent regressions.

@petrochenkov

…ochenkov Detect tuple struct incorrectly used as struct pat Subpart of rust-lang#74005. r? @petrochenkov

Update llvm-project to latest origin/rustc/10.0-2020-05-05 commit which includes LVI segfault fix when building fortanix/rust-sgx#267 And a few earlier commits.

@estebank

…der-type-error, r=estebank typeck: report placeholder type error w/out span Fixes rust-lang#74086. This PR fixes a regression introduced in rust-lang#70369 which meant that an error was not being emitted for invalid placeholder types when there wasn't a span available. r? @estebank

rust-lang#71669: add ui, codegen tests for volatile + nearby int intrinsics Added some tests for intrinsics. See rust-lang#71669.

@GuillaumeGomez

…Gomez Added detailed error code explanation for issue E0688 in Rust compiler. Added proper error explanation for issue E0688 in the Rust compiler. Error Code E0688 Sub Part of Issue rust-lang#61137 r? @GuillaumeGomez

Manishearth · 2020-07-14T03:31:23Z

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

bors · 2020-07-14T03:31:24Z

📌 Commit 8aabb0d has been approved by Manishearth

bors · 2020-07-14T03:31:25Z

🌲 The tree is currently closed for pull requests below priority 5, this pull request will be tested once the tree is reopened

bors · 2020-07-14T03:31:50Z

⌛ Testing commit 8aabb0d with merge cf959fdcc1aebf106827e5888a6cfe07b67f82cd...

bors · 2020-07-14T03:58:49Z

💔 Test failed - checks-azure

Manishearth · 2020-07-14T04:11:29Z

Traceback (most recent call last):
  File "../../src/tools/publish_toolstate.py", line 286, in <module>
    validate_maintainers(repo, github_token)
  File "../../src/tools/publish_toolstate.py", line 87, in validate_maintainers
    'Accept': 'application/vnd.github.hellcat-preview+json',
  File "/usr/lib/python3.6/urllib/request.py", line 223, in urlopen
    return opener.open(url, data, timeout)
  File "/usr/lib/python3.6/urllib/request.py", line 532, in open
    response = meth(req, response)
  File "/usr/lib/python3.6/urllib/request.py", line 642, in http_response
    'http', request, response, code, msg, hdrs)
  File "/usr/lib/python3.6/urllib/request.py", line 570, in error
    return self._call_chain(*args)
  File "/usr/lib/python3.6/urllib/request.py", line 504, in _call_chain
    result = func(*args)
  File "/usr/lib/python3.6/urllib/request.py", line 650, in http_error_default
    raise HTTPError(req.full_url, code, msg, hdrs, fp)
urllib.error.HTTPError: HTTP Error 403: Forbidden

403 on toolstate

@bors retry

bors · 2020-07-14T04:11:51Z

⌛ Testing commit 8aabb0d with merge 7f580ea359533c7f76c49d96abc76ce4d5808abb...

bors · 2020-07-14T04:44:20Z

💔 Test failed - checks-actions

Manishearth · 2020-07-14T04:51:26Z

2020-07-14T04:43:04.4409850Z ---- build::close_output stdout ----
2020-07-14T04:43:04.4410632Z thread 'build::close_output' panicked at 'assertion failed: !status.success()', src/tools/cargo/tests/testsuite/build.rs:5016:9
2020-07-14T04:43:04.4410881Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
2020-07-14T04:43:04.4410985Z 
2020-07-14T04:43:04.4411075Z 
2020-07-14T04:43:04.4411221Z failures:
2020-07-14T04:43:04.4411382Z     build::close_output

Manishearth · 2020-07-14T05:23:25Z

I don't know what this is but i'm going to make a smaller rollup

poliorcetics and others added 30 commits June 29, 2020 19:18

Document the union keyword

2e21af2

Clarify some parts by applying the suggestions from review

614f773

Co-authored-by: Josh Triplett <josh@joshtriplett.org>

Fix caching issue when building tools.

310c97b

clean up E0718 explanation

00980b6

test: rustdoc-ui: Add issue-74134, replacing test/rustdoc/issue-74134-*

689e360

As per the discussion in PR rust-lang#74147, the 4 individual tests are replaced by a single one. The test is expanded to cover all 4 public/private cases, each with and without --document-private-items.

test: rustdoc-ui: Expand issue-74134 to cover types in a private module

9704859

test: rustdoc-ui: issue-74134: Shorten a too long line

8789525

rustdoc: insert newlines between attributes

0979545

Improve wording

4728438

typeck: report placeholder type error w/out span

5afbc52

This commit fixes a regression introduced in rust-lang#70369 which meant that an error was not being emitted for invalid placeholder types when there wasn't a span available. Signed-off-by: David Wood <david@davidtw.co>

Detect tuple struct incorrectly used as struct pat

5daedea

Update RELEASES.md for 1.45.0

ffac887

Update llvm-project to latest origin/rustc/10.0-2020-05-05 commit whi…

ed587f8

…ch includes LVI segfault fix

Added tests for volatile and nearbyint intrinsics

9a3a31a

Added ui tests for volatile and nearby intrinsics

5ff7e1a

Removed trailing whitespace

eac8092

Added proper explanation of ErrorCode-E0688

e3ae4c7

Merge branch 'master' into E0688

bc2b37a

Remove trailing whitespace

8df79fc

Rollup merge of rust-lang#73354 - XAMPPRocky:relnotes-1.45.0, r=Mark-…

2689859

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

Rollup merge of rust-lang#73852 - euclio:rustdoc-attr-newlines, r=Gui…

ce24567

…llaumeGomez rustdoc: insert newlines between attributes Fixes rust-lang#73205.

Rollup merge of rust-lang#74123 - GuillaumeGomez:cleanup-e0718, r=pic…

3742222

…kfire clean up E0718 explanation r? @Dylan-DPC

Rollup merge of rust-lang#74173 - estebank:struct-pat-as-enum, r=petr…

3eb4256

…ochenkov Detect tuple struct incorrectly used as struct pat Subpart of rust-lang#74005. r? @petrochenkov

Rollup merge of rust-lang#74239 - AdrianCX:master, r=cuviper

70fa235

Update llvm-project to latest origin/rustc/10.0-2020-05-05 commit which includes LVI segfault fix when building fortanix/rust-sgx#267 And a few earlier commits.

Rollup merge of rust-lang#74285 - wangtheo:issue-71669, r=lcnr

2bb4bbf

rust-lang#71669: add ui, codegen tests for volatile + nearby int intrinsics Added some tests for intrinsics. See rust-lang#71669.

rustbot added the rollup A PR which is a rollup label Jul 14, 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 14, 2020

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 Jul 14, 2020

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 Jul 14, 2020

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 Jul 14, 2020

Manishearth closed this Jul 14, 2020

Manishearth mentioned this pull request Jul 16, 2020

Rollup of 21 pull requests #74408

Merged

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

ehuss mentioned this pull request Jul 30, 2020

close_output test is randomly failing rust-lang/cargo#8564

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 11 pull requests #74312

Rollup of 11 pull requests #74312

Manishearth commented Jul 14, 2020

Manishearth commented Jul 14, 2020

bors commented Jul 14, 2020

bors commented Jul 14, 2020

bors commented Jul 14, 2020

bors commented Jul 14, 2020

Manishearth commented Jul 14, 2020

bors commented Jul 14, 2020

bors commented Jul 14, 2020

Manishearth commented Jul 14, 2020

Manishearth commented Jul 14, 2020

Rollup of 11 pull requests #74312

Rollup of 11 pull requests #74312

Conversation

Manishearth commented Jul 14, 2020

Manishearth commented Jul 14, 2020

bors commented Jul 14, 2020

bors commented Jul 14, 2020

bors commented Jul 14, 2020

bors commented Jul 14, 2020

Manishearth commented Jul 14, 2020

bors commented Jul 14, 2020

bors commented Jul 14, 2020

Manishearth commented Jul 14, 2020

Manishearth commented Jul 14, 2020