Skip to content

Rollup of 10 pull requests - #79190

Closed
Dylan-DPC-zz wants to merge 30 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-x6y2drm
Closed

Rollup of 10 pull requests#79190
Dylan-DPC-zz wants to merge 30 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-x6y2drm

Conversation

@Dylan-DPC-zz

Copy link
Copy Markdown

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

CraftSpiderand others added 30 commits November 11, 2020 18:15
Backtrace frames might include column numbers.
Print them if they are included.
…ith qualifiers inside an `extern "C"` block
This allows us to:
- Handle precise Places captured by a closure directly in MIR. Handling
captures in MIR is easier since we can rely on/ tweak PlaceBuilder to
generate `mir::Place`s that resemble how we store captures (`hir::Place`).
- Allows us to handle `let _ = x` case when feature `capture_disjoint_fields`
is enabled directly in MIR. This is required to be done in MIR since
patterns are desugared in MIR.
ExprKind::SelfRef was used to express accessing `self` in
the desugared Closure/Generator struct when lowering captures in THIR.
Since we handle captures in MIR now, we don't need `ExprKind::Self`.
Previously, bootstrap.py would attempt to find the LLVM commit from
`src/llvm-project`. However, it assumed it was always being run from the
top-level directory, which isn't always the case.
Before:
```
downloading https://ci-artifacts.rust-lang.org/rustc-builds//rust-dev-nightly-x86_64-unknown-linux-gnu.tar.gz
curl: (22) The requested URL returned error: 404
failed to run: curl -# -y 30 -Y 10 --connect-timeout 30 --retry 3 -Sf -o /tmp/tmppyh4w8 https://ci-artifacts.rust-lang.org/rustc-builds//rust-dev-nightly-x86_64-unknown-linux-gnu.tar.gz
Build completed unsuccessfully in 0:00:02
```
After:
```
downloading https://ci-artifacts.rust-lang.org/rustc-builds/430feb24a46993e5073c1bb1b39da190d83fa2bf/rust-dev-nightly-x86_64-unknown-linux-gnu.tar.gz
###################################################################################################################################################################### 100.0%
extracting /home/joshua/rustc/src/bootstrap/build/cache/llvm-430feb24a46993e5073c1bb1b39da190d83fa2bf-False/rust-dev-nightly-x86_64-unknown-linux-gnu.tar.gz
```
…imulacrum
Tidy should not check line lengths in tests
Tidy will not check line lengths in tests even without the `// ignore-tidy-linelength` annotations. This PR also removes all the annotations which are now unnecessary.
Closes: rust-lang#77548
Make bad "rust-call" arguments no longer ICE
The simplest of bad rust-call definitions will no longer cause an ICE. There is a FIXME added for future work, as I wanted to get this easy fix in before trying to either add a hack or mess with the whole obligation system
fixesrust-lang#22565
Add column number support to Backtrace
Backtrace frames might include column numbers.
Print them if they are included.
…stebank
Improve the diagnostic for when an `fn` contains qualifiers inside an `extern` block.
This mitigates rust-lang#78941. As suggested by ``@estebank,`` `span_suggestion` was replaced with `span_suggestion_verbose` for this specific diagnostic.
…hievink
Don't special case constant operands when lowering intrinsics
Move capture lowering from THIR to MIR
This allows us to:
- Handle precise Places captured by a closure directly in MIR. Handling
captures in MIR is easier since we can rely on/ tweak PlaceBuilder to
generate `mir::Place`s that resemble how we store captures (`hir::Place`).
- Handle `let _ = x` case when feature `capture_disjoint_fields`
is enabled directly in MIR. This is required to be done in MIR since
patterns are desugared in MIR.
Closes: rust-lang/project-rfc-2229#25
r? ``@nikomatsakis``
…crum
Allow using `download-ci-llvm` from directories other than the root
Previously, bootstrap.py would attempt to find the LLVM commit from
`src/llvm-project`. However, it assumed it was always being run from the
top-level directory, which isn't always the case.
Before:
```
downloading https://ci-artifacts.rust-lang.org/rustc-builds//rust-dev-nightly-x86_64-unknown-linux-gnu.tar.gz
curl: (22) The requested URL returned error: 404
failed to run: curl -# -y 30 -Y 10 --connect-timeout 30 --retry 3 -Sf -o /tmp/tmppyh4w8 https://ci-artifacts.rust-lang.org/rustc-builds//rust-dev-nightly-x86_64-unknown-linux-gnu.tar.gz
Build completed unsuccessfully in 0:00:02
```
After:
```
downloading https://ci-artifacts.rust-lang.org/rustc-builds/430feb24a46993e5073c1bb1b39da190d83fa2bf/rust-dev-nightly-x86_64-unknown-linux-gnu.tar.gz
###################################################################################################################################################################### 100.0%
extracting /home/joshua/rustc/src/bootstrap/build/cache/llvm-430feb24a46993e5073c1bb1b39da190d83fa2bf-False/rust-dev-nightly-x86_64-unknown-linux-gnu.tar.gz
```
r? ``@Mark-Simulacrum``
cc ``@pnkfelix``
…t-arguments, r=petrochenkov
Permit standalone generic parameters as const generic arguments in macros
Fixesrust-lang#79127.
r? ``@petrochenkov``
@rustbotrustbot added the rollup A PR which is a rollup label Nov 19, 2020
@Dylan-DPC-zz

Copy link
Copy Markdown
Author

@bors r+ rollup=never p=5

@bors

bors commented Nov 19, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 37e64af has been approved by Dylan-DPC

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 19, 2020
@bors

bors commented Nov 19, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 37e64af with merge 89dfeb2b62e2a2f332115010e24adc4a0faf4333...

@bors

bors commented Nov 19, 2020

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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 Nov 19, 2020
@Dylan-DPC-zz
Dylan-DPC-zz deleted the rollup-x6y2drm branch November 19, 2020 16:46
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

14 participants

@Dylan-DPC-zz@bors@rustbot@CraftSpider@est31@tmiasko@ThePuzzlemaker@Anthuang@camelid@arora-aman@jyn514@varkor@estebank@Dylan-DPC