Skip to content

Rollup of 14 pull requests - #64864

Merged
bors merged 36 commits into
rust-lang:masterfrom
Centril:rollup-pxz6tw3
Sep 28, 2019
Merged

Rollup of 14 pull requests#64864
bors merged 36 commits into
rust-lang:masterfrom
Centril:rollup-pxz6tw3

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

Mark-Simulacrumand others added 30 commits September 25, 2019 21:20
This commit fixes an ICE when `target_feature` is applied to constants.
Signed-off-by: David Wood <david@davidtw.co>
update rtpSpawn's parameters type(It's prototype has been updated in …
See linked comment[1] for context.
1: rust-lang#64809 (comment)
Signed-off-by: David Wood <david@davidtw.co>
When there's a type mismatch we make an effort to check if it was
caused by a function's return type. This logic now makes sure to
only point at the return type if the error happens in a tail
expression.
The non-global context was removed; there's only one context now. This
is a noop method that only serves to confuse readers -- remove it.
There's no longer two distinct gcx and tcx lifetimes which made this
necessary (or, at least, the code compiles -- it's possible we got
better at normalizing, but that seems unlikely).
where `A` is a constant, not a new variable.
…, r=rkruppe
Docs: slice elements are equidistant
Recently, someone asked why `[char]` and `str` are not interchangeable, and I explained that in a slice, the elements must be laid out equidistantly, whereas the chars in a `str` are stored compactly regardless their size. However I couldn't find this documented anywhere, so here's a small addition of this fact.
…varkor
Include message on tests that should panic but do not
As per issue rust-lang#60790 includes a message for tests marked `#[should_panic]` that do not panic as expected.
Fixesrust-lang#60790.
…=estebank
Remove unused DepTrackingMap
Deletes some related code (MemoizationMap trait, etc.)
I believe this became unused with red/green incremental introduction, but am uncertain.
…atthewjasper
Account for tail expressions when pointing at return type
When there's a type mismatch we make an effort to check if it was
caused by a function's return type. This logic now makes sure to
only point at the return type if the error happens in a tail
expression.
Turn `walk_parent_nodes` method into an iterator.
CC rust-lang#39968, CC rust-lang#40799.
…e-const, r=varkor
hir: Disallow `target_feature` on constants
Fixesrust-lang#64768.
This PR fixes an ICE when `#[target_feature]` is applied to constants by disallowing this with the same error as when `#[target_feature]` is applied to other places it shouldn't be.
I couldn't see anything in the [RFC](https://github.com/rust-lang/rfcs/blob/master/text/2045-target-feature.md) that suggested that `#[target_feature]` should be applicable to constants or any tests that suggested it should, though I might have missed something - if this is desirable in future, it remains possible to remove this error (but for the time being, I think this error is better than an ICE).
I also added some extra cases to the test for other places where `#[target_feature]` should not be permitted.
cc @gnzlbg
Fix div_duration() marked as stable by mistake
update rtpSpawn's parameters type(It's prototype has been updated in libc)
r? @alexcrichton
pin.rs: fix links to primitives in documentation
Upgrade env_logger to 0.7
`./x.py test` passed locally.
…arkor
Add mailmap entry for Dustin Bensing by request
This should deduplicate entries from @pythoneer between the stdarch submodule and this repo itself on thanks.rust-lang.org.
…stebank
check_match: improve diagnostics for `let A = 2;` with `const A: i32 = 3`
For example:
```
error[E0005]: refutable pattern in local binding: `std::i32::MIN..=1i32` and `3i32..=std::i32::MAX` not covered
--> $DIR/const-pat-non-exaustive-let-new-var.rs:2:9
|
LL | let A = 3;
| ^
| |
| interpreted as a constant pattern, not a new variable
| help: introduce a variable instead: `a_var`
...
LL | const A: i32 = 2;
| ----------------- constant defined here
```
r? @estebank
cc @matthiaskrgr@rpjohnst
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=14 rollup=never

@bors

bors commented Sep 28, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 017944c has been approved by Centril

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

bors commented Sep 28, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 017944c with merge f3c8eba...

bors added a commit that referenced this pull request Sep 28, 2019
Rollup of 14 pull requests
Successful merges:
- #64703 (Docs: slice elements are equidistant)
- #64745 (Include message on tests that should panic but do not)
- #64781 (Remove stray references to the old global tcx)
- #64794 (Remove unused DepTrackingMap)
- #64802 (Account for tail expressions when pointing at return type)
- #64809 (hir: Disallow `target_feature` on constants)
- #64815 (Fix div_duration() marked as stable by mistake)
- #64818 (update rtpSpawn's parameters type(It's prototype has been updated in libc))
- #64830 (Thou shallt not `.abort_if_errors()`)
- #64836 (Stabilize map_get_key_value feature)
- #64845 (pin.rs: fix links to primitives in documentation)
- #64847 (Upgrade env_logger to 0.7)
- #64851 (Add mailmap entry for Dustin Bensing by request)
- #64859 (check_match: improve diagnostics for `let A = 2;` with `const A: i32 = 3`)
Failed merges:
r? @ghost
@bors

bors commented Sep 28, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: Centril
Pushing f3c8eba to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 28, 2019
@bors
bors merged commit 017944c into rust-lang:masterSep 28, 2019
@rust-highfive

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #64864!

Tested on commit f3c8eba.
Direct link to PR: #64864

💔 clippy-driver on windows: test-pass → build-fail (cc @mcarton@oli-obk@Manishearth@flip1995@yaahc@phansch@llogiq, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton@oli-obk@Manishearth@flip1995@yaahc@phansch@llogiq, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Sep 28, 2019
Tested on commit rust-lang/rust@f3c8eba.
Direct link to PR: <rust-lang/rust#64864>
💔 clippy-driver on windows: test-pass → build-fail (cc @mcarton@oli-obk@Manishearth@flip1995@yaahc@phansch@llogiq, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton@oli-obk@Manishearth@flip1995@yaahc@phansch@llogiq, @rust-lang/infra).
@Centril
Centril deleted the rollup-pxz6tw3 branch September 28, 2019 07:29
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

13 participants

@Centril@bors@rust-highfive@Mark-Simulacrum@bpangWR@mati865@JMS55@davidtwco@n-salim@kungfukennyg@tesuji@estebank@llogiq