Rollup of 18 pull requests#40544

frewsxcv · 2017-03-15T13:08:27Z

Successful merges: Reword the non-dropping of src for ptr::write{,_unaligned} #40387, Add test for issue #29595 #40433, Add basic documentation/examples for six unstable features. #40452, Remove function invokation parens from documentation links. #40456, Update usages of 'OSX' (and other old names) to 'macOS'. #40457, some style fixes #40463, Remove doc about highlighting code in other languages #40301 #40466, Updating README.md to point to the correct doc location #40467, fix format grammar #40495, Using X headings #39850 #40496, Fix sidebar not extending to the bottom of the page #40497, Point out correct turbofish usage on Foo<Bar<Baz>> #40500, std: remove a workaround for privacy limitations #40503, A few improvements to the core::hash top-level docs. #40505, .gitmodules: use official URLs w/o redirect #40512, Inline functions Ordering::{then, then_with} #40514, Remove incorrect feature from the 1.16 relnotes #40517, Link core::slice to std::slice #40520
Failed merges:

As of last year with version 'Sierra', the Mac operating system is now called 'macOS'.

…it`.

… anymore

This was never established as a convention we should follow in the 'More API Documentation Conventions' RFC: https://github.com/rust-lang/rfcs/blob/master/text/1574-more-api-documentation-conventions.md

Primarily opened to address the concerns brought up in rust-lang#40498. * run rustfmt on code blocks * use `DefaultHasher` instead of deprecated `SipHasher` * rename `hash` to `calculate_hash` to prevent confusion with the `hash` method

@jongiddy

@jongiddy noticed bad performance due to the lack of inlining on `then` and `then_with`. I confirmed that inlining really is the culprit by creating a custom `then` function and repeating his benchmark on my machine with and without the `#[inline]` attribute. The numbers were exactly the same on my machine without the attribute. With `#[inline]` I got the same performance as I did with manually inlined implementation.

Whenever we parse a chain of binary operations, as long as the first operation is `<` and the subsequent operations are either `>` or `<`, present the following diagnostic help: use `::<...>` instead of `<...>` if you meant to specify type arguments This will lead to spurious recommendations on situations like `2 < 3 < 4` but should be clear from context that the help doesn't apply in that case.

@niconii

Reword the non-dropping of `src` for `ptr::write{,_unaligned}` @niconii Is it OK if I put your wording into the documentation? CC @nagisa

Add test for issue rust-lang#29595 Closes rust-lang#29595 Couldn't get this to run locally, all the compile-fail tests are ignored... let's see what Travis says.

…GuillaumeGomez Add basic documentation/examples for six unstable features.

…ens, r=GuillaumeGomez Remove function invokation parens from documentation links. This was never established as a convention we should follow in the 'More API Documentation Conventions' RFC: https://github.com/rust-lang/rfcs/blob/master/text/1574-more-api-documentation-conventions.md

…bnik Update usages of 'OSX' (and other old names) to 'macOS'. As of last year with version 'Sierra', the Mac operating system is now called 'macOS'.

some style fixes

bors · 2017-03-15T13:50:09Z

💔 Test failed - status-travis

alexcrichton · 2017-03-15T14:00:40Z

@bors: retry * spurious sccache failure #40240

…

On Wed, Mar 15, 2017 at 8:50 AM, bors ***@***.***> wrote: 💔 Test failed - status-travis <https://travis-ci.org/rust-lang/rust/builds/211341771> — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#40544 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAD95GEz2AOXJLZl5CRu8x2rk-e9HhYiks5rl-yTgaJpZM4Md6j4> .

bors · 2017-03-15T16:41:43Z

⌛ Testing commit a2d2a97 with merge b5ccda0...

Rollup of 18 pull requests - Successful merges: #40387, #40433, #40452, #40456, #40457, #40463, #40466, #40467, #40495, #40496, #40497, #40500, #40503, #40505, #40512, #40514, #40517, #40520 - Failed merges:

bors · 2017-03-15T22:16:04Z

💔 Test failed - status-travis

frewsxcv · 2017-03-15T22:17:17Z

@bors retry

mac things didn't even run

bors · 2017-03-16T03:22:12Z

⌛ Testing commit a2d2a97 with merge 798ee19...

bors · 2017-03-16T03:44:07Z

💔 Test failed - status-travis

alexcrichton · 2017-03-16T05:39:48Z

@bors: retry * spurious sccache failure #40240

…

On Wed, Mar 15, 2017 at 10:44 PM, bors ***@***.***> wrote: 💔 Test failed - status-travis <https://travis-ci.org/rust-lang/rust/builds/211605302> — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#40544 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAD95NTWEW7thVr5VjRHOeRfmxfI6m_rks5rmLAJgaJpZM4Md6j4> .

bors · 2017-03-16T06:44:28Z

⌛ Testing commit a2d2a97 with merge 32468fc...

bors · 2017-03-16T09:44:37Z

💔 Test failed - status-travis

alexcrichton · 2017-03-16T14:07:31Z

@bors: retry * osx timeout #40571

…

On Thu, Mar 16, 2017 at 4:44 AM, bors ***@***.***> wrote: 💔 Test failed - status-travis <https://travis-ci.org/rust-lang/rust/builds/211635717> — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#40544 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAD95JPTnxto7aQLAW__3O9E-uA-dw3hks5rmQSHgaJpZM4Md6j4> .

bors · 2017-03-16T14:40:16Z

⌛ Testing commit a2d2a97 with merge 8d9eb05...

bors · 2017-03-16T15:11:05Z

💔 Test failed - status-travis

alexcrichton · 2017-03-16T15:11:58Z

@bors: retry

I saw one of the OSX bots hanging in compiling LLVM, presumably due to #40240, so going to see how #40575 fares for now.

alexcrichton · 2017-03-16T15:12:14Z

hanging bot

bors · 2017-03-16T15:32:46Z

⌛ Testing commit a2d2a97 with merge d62dea5...

Rollup of 18 pull requests - Successful merges: #40387, #40433, #40452, #40456, #40457, #40463, #40466, #40467, #40495, #40496, #40497, #40500, #40503, #40505, #40512, #40514, #40517, #40520 - Failed merges:

bors · 2017-03-16T18:34:07Z

💔 Test failed - status-travis

alexcrichton · 2017-03-16T20:24:41Z

@bors: retry

I give up...

#40571

bors · 2017-03-17T00:06:12Z

⌛ Testing commit a2d2a97 with merge 585ac0a...

bors · 2017-03-17T01:16:06Z

💔 Test failed - status-travis

tbu- and others added 30 commits March 9, 2017 13:45

Reword the non-dropping of src for ptr::write{,_unaligned}

13341f4

Update usages of 'OSX' (and other old names) to 'macOS'.

97a1b6a

As of last year with version 'Sierra', the Mac operating system is now called 'macOS'.

some style fixes

b38992c

Remove doc about highlighting code in other languages rust-lang#40301

0644773

Updating README.md to point to the correct doc location

6b7b262

Adjust wording rust-lang#40301

eb203d5

fix format grammar

adba642

Add test for issue rust-lang#29595

5e49f79

Using X headings rust-lang#39850

11d3344

Fix sidebar not extending to the bottom of the page

8b9b3b6

Fixes rust-lang#40459

Rust unstable book: basic desc and example for const_fn.

e06c515

Rust unstable book: basic desc and example for `conservative_impl_tra…

327e8e9

…it`.

Rust unstable book: basic desc and example for const_indexing.

0dd03ff

Rust unstable book: basic desc and example for i128_type.

137c1e8

Rust unstable book: basic desc and example for non_ascii_idents.

e58e3d0

Rust unstable book: basic desc and example for concat_idents.

d3ae2eb

std: remove a workaround for privacy limitations that isn't necessary…

1545f4e

… anymore

Remove function invokation parens from documentation links.

e7b0f2b

This was never established as a convention we should follow in the 'More API Documentation Conventions' RFC: https://github.com/rust-lang/rfcs/blob/master/text/1574-more-api-documentation-conventions.md

.gitmodules: use official URLs w/o redirect

0671cc1

Remove incorrect feature from the 1.16 relnotes

cc08edc

Link core::slice to std::slice

8b7c7f3

Rollup merge of rust-lang#40387 - tbu-:pr_doc_ptr_write2, r=steveklabnik

8ab12d7

Reword the non-dropping of `src` for `ptr::write{,_unaligned}` @niconii Is it OK if I put your wording into the documentation? CC @nagisa

Rollup merge of rust-lang#40433 - mattico:test-issue-29595, r=estebank

bb1c465

Add test for issue rust-lang#29595 Closes rust-lang#29595 Couldn't get this to run locally, all the compile-fail tests are ignored... let's see what Travis says.

Rollup merge of rust-lang#40452 - frewsxcv:frewsxcv-unstable-docs, r=…

c4db59f

…GuillaumeGomez Add basic documentation/examples for six unstable features.

Rollup merge of rust-lang#40457 - frewsxcv:frewsxcv-macos, r=stevekla…

23c87ab

…bnik Update usages of 'OSX' (and other old names) to 'macOS'. As of last year with version 'Sierra', the Mac operating system is now called 'macOS'.

Rollup merge of rust-lang#40463 - tshepang:nit, r=nikomatsakis

499b104

some style fixes

frewsxcv closed this Mar 17, 2017

frewsxcv deleted the rollup branch March 17, 2017 01:17

Centril added the rollup A PR which is a rollup label Oct 24, 2019

Uh oh!

Conversation

frewsxcv commented Mar 15, 2017

Uh oh!

bors commented Mar 15, 2017

Uh oh!

alexcrichton commented Mar 15, 2017 via email

Uh oh!

bors commented Mar 15, 2017

Uh oh!

bors commented Mar 15, 2017

Uh oh!

frewsxcv commented Mar 15, 2017

Uh oh!

bors commented Mar 16, 2017

Uh oh!

bors commented Mar 16, 2017

Uh oh!

alexcrichton commented Mar 16, 2017 via email

Uh oh!

bors commented Mar 16, 2017

Uh oh!

bors commented Mar 16, 2017

Uh oh!

alexcrichton commented Mar 16, 2017 via email

Uh oh!

bors commented Mar 16, 2017

Uh oh!

bors commented Mar 16, 2017

Uh oh!

alexcrichton commented Mar 16, 2017

Uh oh!

alexcrichton commented Mar 16, 2017

Uh oh!

bors commented Mar 16, 2017

Uh oh!

bors commented Mar 16, 2017

Uh oh!

alexcrichton commented Mar 16, 2017

Uh oh!

bors commented Mar 17, 2017

Uh oh!

bors commented Mar 17, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants