Rollup of 15 pull requests by steveklabnik · Pull Request #22281 · rust-lang/rust

steveklabnik · 2015-02-13T17:18:07Z

Successful merges: std: Optimize Vec::from_iter #22200, rustdoc: Show must_use attribute #22224, Adjusting default CPUs for iOS #22229, Update LLVM to disable asserts in the PassInfo cache #22238, Correct typo for 'underyling' #22248, Unstabilise words for now. #22253, Remove _VALUE from the float extremes constants. #22254, Remove link to mailing list in bug report submission page #22263, Improve documentation for Select::new(). #22268, Re-word paragraph about enums and equality #22271, Re-tag slicing_syntax as Accepted. #22274, Map clone #22276, Added all active features to the list in reference.md. #22277, Add #[rustc_error] annotation, which causes trans to signal an error #22278, Fix small copy-paste typo #22280
Failed merges:

@dotdash

According to @dotdash it enables more aggressive optimizations from LLVM

This PR is an optimization of the `FromIterator` implementation of `Vec` Benchmark: https://gist.github.com/alexcrichton/03d666159a28a80e7c70 Before: test macro_repeat1 ... bench: 57 ns/iter (+/- 1) test macro_repeat2 ... bench: 56 ns/iter (+/- 1) test map_clone1 ... bench: 828 ns/iter (+/- 13) test map_clone2 ... bench: 828 ns/iter (+/- 8) test repeat1 ... bench: 1104 ns/iter (+/- 10) test repeat2 ... bench: 1106 ns/iter (+/- 11) After: test macro_repeat1 ... bench: 75 ns/iter (+/- 21) test macro_repeat2 ... bench: 59 ns/iter (+/- 31) test map_clone1 ... bench: 34 ns/iter (+/- 22) test map_clone2 ... bench: 52 ns/iter (+/- 21) test repeat1 ... bench: 34 ns/iter (+/- 11) test repeat2 ... bench: 33 ns/iter (+/- 12) The idea behind this optimization is to avoid all bounds checks for space already allocated into the vector. This may involve running the iterator twice, but the first run of the iterator should be optimizable to a memcpy or memset if possible. The same treatment can in theory be applied to `Vec::extend` but the benchmarks for that currently get *worse* if the change is applied. This appears to be some LLVM optimizations going awry but it's seems prudent to land at least the `collect` portion beforehand.

Fixesrust-lang#22233

It is not totally clear if we should just use whitespace, or if the full unicode word-breaking algorithm is more correct. If there is demand we can reconsider this decision (and consider the precise algorithm to use in detail). cc rust-lang#15628.

In `std::f32` and `std::f64`: - `MIN_VALUE` → `MIN` - `MAX_VALUE` → `MAX` - `MIN_POS_VALUE` → `MIN_POSITIVE` This matches the corresponding integer constants. [breaking-change]

Also add address of IRC server. Addresses rust-lang#22249.

This partially resolvesrust-lang#22243.

This resolvesrust-lang#22243, at least for one-letter variable names.

Remove incorrect claim, add example, reformat and re-word. Fixesrust-lang#22266

Fixesrust-lang#22035.

Rollup merge (373cbab) of PR rust-lang#20723 accidentally reverted a portion of commit 8327bcc which shifted `slicing_syntax` from Active to Accepted.

Added a second note about keeping the reference.md list up-to-date to the bottom of the list, since not everyone (including me) reads the big comment at the top of it. :) Ensured that the feature gate list in reference.md is kept in alphabetical order.

if found on the `main()` function. This lets you write tests that live in `compile-fail` but are expected to compile successfully. This is handy when you have many small variations on a theme that you want to keep together, and you are just testing the type checker, not the runtime semantics.

This PR is an optimization of the `FromIterator` implementation of `Vec` Benchmark: https://gist.github.com/alexcrichton/03d666159a28a80e7c70 Before: test macro_repeat1 ... bench: 57 ns/iter (+/- 1) test macro_repeat2 ... bench: 56 ns/iter (+/- 1) test map_clone1 ... bench: 828 ns/iter (+/- 13) test map_clone2 ... bench: 828 ns/iter (+/- 8) test repeat1 ... bench: 1104 ns/iter (+/- 10) test repeat2 ... bench: 1106 ns/iter (+/- 11) After: test macro_repeat1 ... bench: 75 ns/iter (+/- 21) test macro_repeat2 ... bench: 59 ns/iter (+/- 31) test map_clone1 ... bench: 34 ns/iter (+/- 22) test map_clone2 ... bench: 52 ns/iter (+/- 21) test repeat1 ... bench: 34 ns/iter (+/- 11) test repeat2 ... bench: 33 ns/iter (+/- 12) The idea behind this optimization is to avoid all bounds checks for space already allocated into the vector. This may involve running the iterator twice, but the first run of the iterator should be optimizable to a memcpy or memset if possible. The same treatment can in theory be applied to `Vec::extend` but the benchmarks for that currently get *worse* if the change is applied. This appears to be some LLVM optimizations going awry but it's seems prudent to land at least the `collect` portion beforehand.

Fixrust-lang#20109.

@dotdash

According to @dotdash it enables more aggressive optimizations from LLVM

@alexcrichton

…hton Fixesrust-lang#22233 r? @alexcrichton

It is not totally clear if we should just use whitespace, or if the full unicode word-breaking algorithm is more correct. If there is demand we can reconsider this decision (and consider the precise algorithm to use in detail). cc rust-lang#15628.

In `std::f32` and `std::f64`: - `MIN_VALUE` → `MIN` - `MAX_VALUE` → `MAX` - `MIN_POS_VALUE` → `MIN_POSITIVE` This matches the corresponding integer constants. [breaking-change]

…akis Removes the link to the rust-dev mailing list in the bug report submission page and also adds the address of the IRC server (`irc.mozilla.org`). Addresses rust-lang#22249.

…tsakis Remove incorrect claim, add example, reformat and re-word. Fixesrust-lang#22266

Fixesrust-lang#22035.

…cepted, r=nikomatsakis Rollup merge (373cbab) of PR rust-lang#20723 accidentally reverted a portion of commit 8327bcc which shifted `slicing_syntax` from Active to Accepted.

This resolvesrust-lang#22243 for the single-letter variables that I could grep. Some occurences could not be replaced.

…ate-list, r=steveklabnik Added all active features to the list in reference.md. Added a second note about keeping the reference.md list up-to-date to the bottom of the list, since not everyone (including me) reads the big comment at the top of it. :) Ensured that the feature gate list in reference.md is kept in alphabetical order.

@pnkfelix

…sakis Add `#[rustc_error]` annotation, which causes trans to signal an error if found on the `main()` function. This lets you write tests that live in `compile-fail` but are expected to compile successfully. This is handy when you have many small variations on a theme that you want to keep together, and you are just testing the type checker, not the runtime semantics. r? @pnkfelix

rust-highfive · 2015-02-13T17:18:21Z

r? @nikomatsakis

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

steveklabnik · 2015-02-13T17:18:23Z

@bors: r+ ee96742

bors · 2015-02-13T20:54:36Z

⌛ Testing commit ee96742 with merge 21a3d9e...

bors · 2015-02-13T21:15:38Z

💔 Test failed - auto-linux-64-nopt-t

... as it is no longer needed.

steveklabnik · 2015-02-13T21:44:15Z

@bors: r+ 7ac46el

bors · 2015-02-13T21:44:16Z

🙀 You have the wrong number! Please try again with 7ac46e1.

steveklabnik · 2015-02-13T21:44:23Z

@bors: r+ 7ac46e1

huonw · 2015-02-14T08:53:05Z

@bors p=1

bors · 2015-02-14T12:43:41Z

⌛ Testing commit 7ac46e1 with merge 5d7625a...

bors · 2015-02-14T13:08:31Z

💔 Test failed - auto-linux-64-opt

steveklabnik · 2015-02-14T13:45:39Z

Closing in favor of a bigger rollup

@steveklabnik

This overlaps with rust-lang#22276 (I left make check running overnight) but covers a number of additional cases and has a few rewrites where the clones are not even necessary. This also implements `RandomAccessIterator` for `iter::Cloned` cc @steveklabnik, you may want to glance at this before rust-lang#22281 gets the bors treatment

sanxiynand others added 30 commits February 13, 2015 00:47

rustdoc: Show must_use attribute
995b159

Adjusting default CPUs for iOS
00a6ff9
According to @dotdash it enables more aggressive optimizations from LLVM

Update LLVM to disable asserts in the PassInfo cache
3df5c4a
Fixesrust-lang#22233

Correct typo for 'underyling'
9c686dc

Unstabilise words for now.
3d9528a
It is not totally clear if we should just use whitespace, or if the full unicode word-breaking algorithm is more correct. If there is demand we can reconsider this decision (and consider the precise algorithm to use in detail). cc rust-lang#15628.

Remove _VALUE from the float extremes constants.
e4a9eb9
In `std::f32` and `std::f64`: - `MIN_VALUE` → `MIN` - `MAX_VALUE` → `MAX` - `MIN_POS_VALUE` → `MIN_POSITIVE` This matches the corresponding integer constants. [breaking-change]

Remove reference to mailing list
c5dba72
Also add address of IRC server. Addresses rust-lang#22249.

Replace map(|x| *x) with cloned().
c6a647a
This partially resolvesrust-lang#22243.

Relpace map(|x| x.clone()) with cloned().
1c7cb8b

Replace map(|x| (*x).clone()) with cloned().
539866b
This resolvesrust-lang#22243, at least for one-letter variable names.

Improve documentation for Select::new().
805a31f
Remove incorrect claim, add example, reformat and re-word. Fixesrust-lang#22266

Re-word paragraph about enums and equality
58a7d58
Fixesrust-lang#22035.

Re-tag slicing_syntax as Accepted.
d414a39
Rollup merge (373cbab) of PR rust-lang#20723 accidentally reverted a portion of commit 8327bcc which shifted `slicing_syntax` from Active to Accepted.

Revert incorrect map(|x| *x) -> cloned() substitutions.
c9ad0d1

Fix small copy-paste typo
f48eda8

Rollup merge ofrust-lang#22224- sanxiyn:must-use, r=cmr
6f03875
Fixrust-lang#20109.

Rollup merge ofrust-lang#22229- vhbit:ios-default-cpus, r=alexcrichton
7c27d41
According to @dotdash it enables more aggressive optimizations from LLVM

Rollup merge ofrust-lang#22238- dotdash:llvmup_20150212, r=alexcric…
f62eea1
…hton Fixesrust-lang#22233 r? @alexcrichton

Rollup merge ofrust-lang#22248- duaneedwards:patch-1, r=Gankro
d1fbf55

Rollup merge ofrust-lang#22254- huonw:float-value--, r=aturon
db01550
In `std::f32` and `std::f64`: - `MIN_VALUE` → `MIN` - `MAX_VALUE` → `MAX` - `MIN_POS_VALUE` → `MIN_POSITIVE` This matches the corresponding integer constants. [breaking-change]

Rollup merge ofrust-lang#22263- iKevinY:no-mailing-list, r=nikomats…
9c9c0f6
…akis Removes the link to the rust-dev mailing list in the bug report submission page and also adds the address of the IRC server (`irc.mozilla.org`). Addresses rust-lang#22249.

Rollup merge ofrust-lang#22268- steveklabnik:improve_wait, r=nikoma…
7813bbb
…tsakis Remove incorrect claim, add example, reformat and re-word. Fixesrust-lang#22266

Rollup merge ofrust-lang#22271- steveklabnik:gh22035, r=nikomatsakis
13a0e5a
Fixesrust-lang#22035.

Rollup merge ofrust-lang#22274- pnkfelix:retag-slicing-syntax-as-ac…
e354763
…cepted, r=nikomatsakis Rollup merge (373cbab) of PR rust-lang#20723 accidentally reverted a portion of commit 8327bcc which shifted `slicing_syntax` from Active to Accepted.

Rollup merge ofrust-lang#22276- ruud-v-a:map-clone, r=nikomatsakis
af595a3
This resolvesrust-lang#22243 for the single-letter variables that I could grep. Some occurences could not be replaced.

steveklabnik added 3 commits February 13, 2015 12:18

Rollup merge ofrust-lang#22280- Unode:patch-1, r=steveklabnik
ee96742

rust-highfive assigned nikomatsakis Feb 13, 2015

steveklabnik assigned steveklabnik and unassigned nikomatsakis Feb 13, 2015

Ryman mentioned this pull request Feb 13, 2015
Opt for .cloned() over .map(|foo| foo.clone()) etc. #22287
Merged

Remove slicing_syntax feature gate
7ac46e1
... as it is no longer needed.

steveklabnik closed this Feb 14, 2015

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

Navigation Menu

Uh oh!

Uh oh!

Rollup of 15 pull requests - #22281

Rollup of 15 pull requests#22281
steveklabnik wants to merge 34 commits into
rust-lang:masterfrom
steveklabnik:rollup

steveklabnik commented Feb 13, 2015

Uh oh!

rust-highfive commented Feb 13, 2015

Uh oh!

steveklabnik commented Feb 13, 2015

Uh oh!

bors commented Feb 13, 2015

Uh oh!

bors commented Feb 13, 2015

Uh oh!

steveklabnik commented Feb 13, 2015

Uh oh!

bors commented Feb 13, 2015

Uh oh!

steveklabnik commented Feb 13, 2015

Uh oh!

huonw commented Feb 14, 2015

Uh oh!

bors commented Feb 14, 2015

Uh oh!

bors commented Feb 14, 2015

Uh oh!

steveklabnik commented Feb 14, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants

Uh oh!

Uh oh!

Conversation

steveklabnik commented Feb 13, 2015

Uh oh!

rust-highfive commented Feb 13, 2015

Uh oh!

steveklabnik commented Feb 13, 2015

Uh oh!

bors commented Feb 13, 2015

Uh oh!

bors commented Feb 13, 2015

Uh oh!

steveklabnik commented Feb 13, 2015

Uh oh!

bors commented Feb 13, 2015

Uh oh!

steveklabnik commented Feb 13, 2015

Uh oh!

huonw commented Feb 14, 2015

Uh oh!

bors commented Feb 14, 2015

Uh oh!

bors commented Feb 14, 2015

Uh oh!

steveklabnik commented Feb 14, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants