Fix extended bootstrap issues with OpenSSL on NetBSD build hosts by jakllsch · Pull Request #44320 · rust-lang/rust

jakllsch · 2017-09-04T20:51:46Z

No description provided.

Adds `impl<T, U> TryFrom<T> for U where U: From<T>`. Removes `impl<'a, T> TryFrom<&'a str> for T where T: FromStr` due to overlapping impls caused by the new blanket impl. This removal is to be discussed further on the tracking issue for TryFrom. Refs rust-lang#33417.

See rust-lang#44174 (comment)

See https://travis-ci.org/rust-lang/rust/jobs/269861252

…aced.

rust-highfive · 2017-09-04T20:51:51Z

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

Mark-Simulacrum · 2017-09-04T21:50:57Z

@bors r+

bors · 2017-09-04T21:50:58Z

📌 Commit ab89870 has been approved by Mark-Simulacrum

bors · 2017-09-05T07:35:56Z

⌛ Testing commit ab89870 with merge 88c5140a653fdad0e47173c82cc5877430225c71...

bors · 2017-09-05T08:46:08Z

💔 Test failed - status-travis

kennytm · 2017-09-05T08:48:12Z

@bors retry #44221

bors · 2017-09-05T09:29:06Z

⌛ Testing commit ab89870 with merge 7ec9447c941d9ff14a5cef56771621bac50d686b...

bors · 2017-09-05T10:08:08Z

💔 Test failed - status-travis

kennytm · 2017-09-05T10:43:04Z

@bors retry #40474 or #44221

check x86_64-apple-darwin failed to download the stage0 compiler. (2nd retry.)

Attempting with retry: make prepare
[00:03:57] downloading https://static.rust-lang.org/dist/2017-08-29/rust-std-beta-x86_64-apple-darwin.tar.gz
No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build has been terminated

bors · 2017-09-05T11:00:20Z

⌛ Testing commit ab89870 with merge 8856ebd935bc0582ed59919f63e8c96d8dcff415...

bors · 2017-09-05T11:38:07Z

💔 Test failed - status-travis

kennytm · 2017-09-05T12:00:42Z

@bors retry p=-1 #44221

check i686-apple-darwin failed. Reducing priority at 3rd retry to give other PRs a try.

Details

[00:02:08] Attempting with retry: sh -c git submodule deinit -f src/libcompiler_builtins && git submodule update --init --recursive --reference /Users/travis/rustsrc/src/src/libcompiler_builtins src/libcompiler_builtins
[00:02:08] Cleared directory 'src/libcompiler_builtins'
[00:02:08] Submodule 'src/libcompiler_builtins' (https://github.com/rust-lang-nursery/compiler-builtins) registered for path 'src/libcompiler_builtins'
[00:02:08] Cloning into '/Users/travis/build/rust-lang/rust/src/libcompiler_builtins'...
[00:02:09] Submodule path 'src/libcompiler_builtins': checked out '6b9281d2b2f0ebb94838814b1e8ace2de4b7035b'
[00:02:09] Submodule 'compiler-rt/compiler-rt-cdylib/compiler-rt' (https://github.com/rust-lang/compiler-rt) registered for path 'src/libcompiler_builtins/compiler-rt'
[00:02:09] Cloning into '/Users/travis/build/rust-lang/rust/src/libcompiler_builtins/compiler-rt'...
[00:02:10] warning: no common commits
No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build has been terminated

…d-8c68-1aecbd570fab, r=Mark-Simulacrum Fix extended bootstrap issues with OpenSSL on NetBSD build hosts

@nikomatsakis

First step toward implementing impl Trait in argument position First step implementing rust-lang#44721. Add a flag to hir and ty TypeParameterDef and raise an error when using explicit type parameters when calling a function using impl Trait in argument position. I don't know if there is a procedure to add an error code so I just took an available code. Is that ok ? r? @nikomatsakis

Impl Try for Option This is part of rust-lang#31436.

@sfackler

…ackler Add blanket TryFrom impl when From is implemented. Adds `impl<T, U> TryFrom<T> for U where U: From<T>`. Removes `impl<'a, T> TryFrom<&'a str> for T where T: FromStr` (originally added in rust-lang#40281) due to overlapping impls caused by the new blanket impl. This removal is to be discussed further on the tracking issue for TryFrom. Refs rust-lang#33417. /cc @sfackler, @scottmcm (thank you for the help!), and @aturon

Mark-Simulacrum · 2017-09-29T22:42:49Z

@bors r+

bors · 2017-09-29T22:42:50Z

📌 Commit 90aa66b has been approved by Mark-Simulacrum

@nikomatsakis

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.

@migi

Allow T op= &T for built-in numeric types T v2 Manually rebase of @migi rust-lang#41336

…d-8c68-1aecbd570fab, r=Mark-Simulacrum Fix extended bootstrap issues with OpenSSL on NetBSD build hosts

@Mark-Simulacrum

Add --all flag to ./x.py clean This make `clean` removes the LLVM and download cache directory as well. Fixesrust-lang#44214. r? @Mark-Simulacrum

Infer `T: 'x` outlives requirements on structs rust-lang#44493 rust-lang#44493

Add doc example to HashMap::hasher None

@steveklabnik

docs improvement std::sync::{PoisonError, TryLockError} Addresses the `PoisonError` and `TryLockError` parts of rust-lang#29377. Adds examples and links. r? @steveklabnik

Backport libs stabilizations to 1.21 beta 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 These have been backported in rust-lang#44823.

…=QuietMisdreavus Add missing links in fmt module r? @rust-lang/docs

Improve wording for StepBy 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.

Move src/librustc_mir/transform/nll.rs to a subdirectory CC rust-lang#43234

@steveklabnik

docs improvement sync::atomic::Atomic* Addresses the `Atomic*` part of rust-lang#29377. r? @steveklabnik

Remove DepNodeIndex::new is already impl for Idx

…ing, r=sfackler Normalize spaces in lang attributes. So, like, I grepped for all `lang` attributes for *reasons* and I noticed that they all share the same spacing of `#[lang = "item_name"]` except these five instances. So I decided to fix that. So enjoy this PR of exactly ten spaces.

ci: Fix building disabled containers * Change the context into the disabled directory. Now you can test containers which are disabled.

…komatsakis Remove new and index methods already implement for Idx These are the rest of the repeated implementations for new and index methods. Follow up of rust-lang#44889

…crum Rollup of 15 pull requests - Successful merges: rust-lang#44124, rust-lang#44287, rust-lang#44320, rust-lang#44694, rust-lang#44708, rust-lang#44794, rust-lang#44797, rust-lang#44824, rust-lang#44836, rust-lang#44840, rust-lang#44845, rust-lang#44854, rust-lang#44889, rust-lang#44900, rust-lang#44903 - Failed merges:

bors · 2017-09-30T13:32:33Z

☔ The latest upstream changes (presumably #44936) made this pull request unmergeable. Please resolve the merge conflicts.

Mark-Simulacrum · 2017-09-30T15:03:07Z

Merged in #44936.

jimmycuadraand others added 9 commits August 29, 2017 22:13

Implement TryFrom explicitly for infallible numeric conversions.
b0edfce
See rust-lang#44174 (comment)

Remove test case that assumes FromStr provides TryFrom<&'a str>.
414ee9a
See https://travis-ci.org/rust-lang/rust/jobs/269861252

Reword docs for Infallible to make them easier to understand.
36c0ff8

impl From<Infallible> for TryFromIntError.
93a56cd

Added a way to retrieve the key out of a HashMap when it's being repl…
e9f01bc
…aced.

Manuall rebase of@migipull/41336
f65bb2a

get ci green
9a547fc

Marked Entry::replace as unstable.
a312b47

rust-highfive assigned aturon Sep 4, 2017

arielb1 added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 5, 2017

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Sep 6, 2017
Rollup merge ofrust-lang#44320- jakllsch:jakllsch-caf2c3d2-c939-4c4…
a660f0c
…d-8c68-1aecbd570fab, r=Mark-Simulacrum Fix extended bootstrap issues with OpenSSL on NetBSD build hosts

Mark-Simulacrum mentioned this pull request Sep 6, 2017
Rollup of 22 pull requests #44369
Closed

borsand others added 5 commits September 29, 2017 15:54

Auto merge ofrust-lang#42526- huntiep:try_opt, r=nikomatsakis
6f87d20
Impl Try for Option This is part of rust-lang#31436.

Simplify implementation of From<Infallible> for TryFromIntError.
966cf33

Fix more TryFrom impls for integers.
27d95d3

Mark-Simulacrum added 15 commits September 29, 2017 17:58

Rollup merge ofrust-lang#44287- Eh2406:master, r=aturon
f91c55e
Allow T op= &T for built-in numeric types T v2 Manually rebase of @migi rust-lang#41336

Rollup merge ofrust-lang#44320- jakllsch:jakllsch-caf2c3d2-c939-4c4…
20f892f
…d-8c68-1aecbd570fab, r=Mark-Simulacrum Fix extended bootstrap issues with OpenSSL on NetBSD build hosts

Rollup merge ofrust-lang#44694- tommyip:make_clean, r=Mark-Simulacrum
6bc8ca0
Add --all flag to ./x.py clean This make `clean` removes the LLVM and download cache directory as well. Fixesrust-lang#44214. r? @Mark-Simulacrum

Rollup merge ofrust-lang#44708- toidiu:ak-44493, r=nikomatsakis
8083877
Infer `T: 'x` outlives requirements on structs rust-lang#44493 rust-lang#44493

Rollup merge ofrust-lang#44794- napen123:master, r=frewsxcv
f2feb83
Add doc example to HashMap::hasher None

Rollup merge ofrust-lang#44797- lucasem:master, r=frewsxcv
b1437bc
docs improvement std::sync::{PoisonError, TryLockError} Addresses the `PoisonError` and `TryLockError` parts of rust-lang#29377. Adds examples and links. r? @steveklabnik

Rollup merge ofrust-lang#44836- GuillaumeGomez:fmt-missing-links, r…
327cd0d
…=QuietMisdreavus Add missing links in fmt module r? @rust-lang/docs

Rollup merge ofrust-lang#44840- steveklabnik:fix-wording, r=BurntSushi
3d7a390
Improve wording for StepBy 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.

Rollup merge ofrust-lang#44845- SimonSapin:nll_mod_rs, r=nikomatsakis
7c3d376
Move src/librustc_mir/transform/nll.rs to a subdirectory CC rust-lang#43234

Rollup merge ofrust-lang#44854- lucasem:atomic-docs, r=steveklabnik
7756d39
docs improvement sync::atomic::Atomic* Addresses the `Atomic*` part of rust-lang#29377. r? @steveklabnik

Rollup merge ofrust-lang#44889- spastorino:remove_new, r=arielb1
37c74e1
Remove DepNodeIndex::new is already impl for Idx

Rollup merge ofrust-lang#44903- kallisti5:ci-build-disabled, r=aidanhs
d6451f0
ci: Fix building disabled containers * Change the context into the disabled directory. Now you can test containers which are disabled.

Mark-Simulacrum mentioned this pull request Sep 29, 2017
Rollup of 15 pull requests #44936
Closed

bors added 2 commits September 30, 2017 06:56

Auto merge ofrust-lang#44893- spastorino:remove_new_and_index, r=ni…
4491ea5
…komatsakis Remove new and index methods already implement for Idx These are the rest of the repeated implementations for new and index methods. Follow up of rust-lang#44889

jakllsch closed this Sep 30, 2017

jakllsch deleted the jakllsch-caf2c3d2-c939-4c4d-8c68-1aecbd570fab branch September 30, 2017 13:52

Uh oh!

Uh oh!

Conversation

jakllsch commented Sep 4, 2017

Uh oh!

rust-highfive commented Sep 4, 2017

Uh oh!

Mark-Simulacrum commented Sep 4, 2017

Uh oh!

bors commented Sep 4, 2017

Uh oh!

bors commented Sep 5, 2017

Uh oh!

bors commented Sep 5, 2017

Uh oh!

kennytm commented Sep 5, 2017

Uh oh!

bors commented Sep 5, 2017

Uh oh!

bors commented Sep 5, 2017

Uh oh!

kennytm commented Sep 5, 2017

Uh oh!

bors commented Sep 5, 2017

Uh oh!

bors commented Sep 5, 2017

Uh oh!

kennytm commented Sep 5, 2017

Uh oh!

Mark-Simulacrum commented Sep 29, 2017

Uh oh!

bors commented Sep 29, 2017

Uh oh!

bors commented Sep 30, 2017

Uh oh!

Mark-Simulacrum commented Sep 30, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants