Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 15 pull requests #44936

Closed
wants to merge 44 commits into from

Conversation

Eh2406 and others added 30 commits September 3, 2017 09:12
This flag removes all build artifacts, including the LLVM build
directory.
This includes the following stabilizations:

- tcpstream_connect_timeout rust-lang#44563
- iterator_for_each rust-lang#44567
- ord_max_min rust-lang#44593
- compiler_fences rust-lang#44595
- needs_drop rust-lang#44639
- vec_splice rust-lang#44640
No other iterator makes the distinction between an iterator and an iterator adapter
in its summary line, so change it to be consistent with all other adapters.
That kind of formatting seems like the job of other code.
NetBSD doesn't ship with sha256sum.  The openssl build will probably
try to use perl anyway, so using perl's shasum is reasonable.
Some tar(1) programs—such as NetBSD's—do not automatically decompress.
* Change the context into the disabled directory. Now you can test
  containers which are disabled.
adding E0623 for return types - both parameters are anonymous

This is a fix for rust-lang#44018
```
error[E0621]: explicit lifetime required in the type of `self`
  --> $DIR/ex3-both-anon-regions-return-type-is-anon.rs:17:5
   |
16 |   fn foo<'a>(&self, x: &i32) -> &i32 {
   |                        ----     ----
   |                        |
   |                        this parameter and the return type are
                            declared with different lifetimes...
17 |     x
   |     ^ ...but data from `x` is returned here

error: aborting due to previous error
```
It also works for the below case where we have self as anonymous

```
error[E0623]: lifetime mismatch
  --> src/test/ui/lifetime-errors/ex3-both-anon-regions-self-is-anon.rs:17:19
   |
16 |     fn foo<'a>(&self, x: &Foo) -> &Foo {
   |                          ----     ----
   |                          |
   |                          this parameter and the return type are
                            declared with different lifetimes...
17 |         if true { x } else { self }
   |                   ^ ...but data from `x` is returned here

error: aborting due to previous error
```
r? @nikomatsakis

Currently, I have enabled E0621 where return type and self are anonymous, hence WIP.
@bors
Copy link
Contributor

bors commented Sep 30, 2017

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Member

@bors
Copy link
Contributor

bors commented Sep 30, 2017

⌛ Testing commit d6451f0 with merge c4cca3a...

bors added a commit that referenced this pull request Sep 30, 2017
@bors
Copy link
Contributor

bors commented Sep 30, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing c4cca3a to master...

@Mark-Simulacrum
Copy link
Member Author

@bors retry

@bors
Copy link
Contributor

bors commented Sep 30, 2017

⌛ Testing commit d6451f0 with merge c4cca3a...

@frewsxcv
Copy link
Member

Was this already pushed to master?

@Mark-Simulacrum
Copy link
Member Author

Yes, actually. Closing.

@Mark-Simulacrum
Copy link
Member Author

@bors retry

@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.