Rollup of 23 pull requests by sophiajt · Pull Request #35747 · rust-lang/rust

sophiajt · 2016-08-17T13:25:29Z

Successful merges: A disclaimer about keywords. #34370, Update compiler error 0030 to use new error format. #35415, Clarify type declaration language in Associated Types docs #35595, Add note to docs for &str that example is to demo internals only #35610, provide additional justification for array interface design #35613, run rustfmt on libsyntax_ext folder #35614, Add doc example for std::ffi::CString::from_vec_unchecked. #35621, Update E0207 label to report parameter type #35660, Improve No stdlib and related Documentation #35663, Update error E0365 to new format #35670, Update E0392 to new error format #35671, Update E0322 to new format #35672, Fix spacing in code of closures.md #35681, update E0375 to new format #35686, expound on limitations of Rust's trait-based operator overloading #35690, accumulate into vector and assert, instead of printing #35695, Implement Debug for std::vec::IntoIter. #35707, RUST_NEW_ERROR_FORMAT is no more #35708, Use UI test to test spans, instead of forced line break #35713, Updated E0394 & E0422 to new format #35722, Bump version to 1.13 #35725, update E0409 to new error format #35726, Update E0005 to use a label #35731
Failed merges: Update E0057 error message to new format #35395

Explain why Rust does not implement traits for large arrays. Explain why most methods are implemented on slices rather than arrays.

Fixesrust-lang#35642.

The spacing seems inconsistent with existing style conventions.

Some people cite this list as "zomg Rust has so many keywords," so make it clear that these aren't all used by the language today.

Part of rust-lang#29330

I'm only making this change in one place so that people can express their preferences for this stylistic change. If/when this change is approved I'll go ahead and translate the rest of the `std::ops` examples.

Display all the remaining items of the iterator, similar to the `Debug` implementation for `core::slice::Iter`: https://github.com/rust-lang/rust/blob/f0bab98695f0a4877daabad9a5b0ba3e66121392/src/libcore/slice.rs#L930-L937 Using the `as_slice` method that was added in: rust-lang#35447

…=Manishearth A disclaimer about keywords. Some people cite this list as "zomg Rust has so many keywords," so make it clear that these aren't all used by the language today.

…andturner Update compiler error 0030 to use new error format. Part of rust-lang#35233, Addresses rust-lang#35204 r? @jonathandturner

…ed, r=steveklabnik expound on limitations of Rust's trait-based operator overloading Part of rust-lang#29330

…tln, r=GuillaumeGomez accumulate into vector and assert, instead of printing I'm only making this change in one place so that people can express their preferences for this stylistic change. If/when this change is approved I'll go ahead and translate the rest of the `std::ops` examples.

…xcrichton Implement `Debug` for `std::vec::IntoIter`. Display all the remaining items of the iterator, similar to the `Debug` implementation for `core::slice::Iter`: https://github.com/rust-lang/rust/blob/f0bab98695f0a4877daabad9a5b0ba3e66121392/src/libcore/slice.rs#L930-L937 Using the `as_slice` method that was added in: rust-lang#35447

…sakis RUST_NEW_ERROR_FORMAT is no more So stop setting the environment variable.

Use UI test to test spans, instead of forced line break There must be lots more, but these are what I could easily find.

…andturner Updated E0394 & E0422 to new format Fixesrust-lang#35692 and rust-lang#35700, as part of rust-lang#35233. r? @jonathandturner

Bump version to 1.13

update E0409 to new error format fixesrust-lang#35699 as part of rust-lang#35233. r? @jonathandturner

Update E0005 to use a label Fixesrust-lang#35192 as Part of rust-lang#35233 r? @jonathandturner

rust-highfive · 2016-08-17T13:25:41Z

r? @brson

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

sophiajt · 2016-08-17T13:25:48Z

@bors r+ r=10

bors · 2016-08-17T13:25:49Z

📌 Commit c216617 has been approved by 10

bors · 2016-08-17T13:25:50Z

💡 This pull request was already approved, no need to approve it again.

There's another pull request that is currently being tested, blocking this pull request: rustdoc: redirect URLs #35236

bors · 2016-08-17T13:25:50Z

📌 Commit c216617 has been approved by jonathandturner

sophiajt · 2016-08-17T13:25:59Z

@bors p=10

sophiajt · 2016-08-17T13:26:25Z

@bors r=jonathandturner

bors · 2016-08-17T13:26:25Z

💡 This pull request was already approved, no need to approve it again.

There's another pull request that is currently being tested, blocking this pull request: Make vec::IntoIter covariant again #35733

bors · 2016-08-17T13:26:26Z

📌 Commit c216617 has been approved by jonathandturner

bors · 2016-08-17T16:49:35Z

⌛ Testing commit c216617 with merge 7ac11ca...

Rollup of 23 pull requests - Successful merges: #34370, #35415, #35595, #35610, #35613, #35614, #35621, #35660, #35663, #35670, #35671, #35672, #35681, #35686, #35690, #35695, #35707, #35708, #35713, #35722, #35725, #35726, #35731 - Failed merges: #35395

bors · 2016-08-17T20:08:08Z

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-no-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-no-mir, auto-win-msvc-64-opt-rustbuild
Approved by: jonathandturner
Pushing 7ac11ca to master...

urschreiand others added 30 commits August 11, 2016 20:05

Clarify type declaration language
2ed052d

More clarification
31da7f6

Add note to docs for &str that example is to demo internals only
91a2c25

run rustfmt on libsyntax_ext folder
d652639

Add doc example for std::ffi::CString::from_vec_unchecked.
4e4d8ba

Update note to include recommendation to use .as_slice()
758aff7

provide additional justification for array interface design
e173ead
Explain why Rust does not implement traits for large arrays. Explain why most methods are implemented on slices rather than arrays.

Update E0207 label to report parameter type
19a3337
Fixesrust-lang#35642.

Improve No stdlib and related Documentation
e586d21

Update E0322 to new format
5286a5a

Update error E0365 to new format
a026e2c

Update E0392 to new error format
6d998d6

Update compiler error 0030 to use new error format.
fa61f82

Fix spacing in code of closures.md
9e39861
The spacing seems inconsistent with existing style conventions.

A disclaimer about keywords.
85bbbad
Some people cite this list as "zomg Rust has so many keywords," so make it clear that these aren't all used by the language today.

update E0375 to new format
349f10a

expound on limitations of Rust's trait-based operator overloading
18edae4
Part of rust-lang#29330

accumulate into vector and assert, instead of printing
c9f2055
I'm only making this change in one place so that people can express their preferences for this stylistic change. If/when this change is approved I'll go ahead and translate the rest of the `std::ops` examples.

remove .take(10) from Range example
2c9a1d9

RUST_NEW_ERROR_FORMAT is no more
d52eb1a

Use UI test to test spans, instead of forced line break
3aa6340

Bump version to 1.13
16fc025

Updated E0422 to new error message
d2e7895

Updated E0394 to new error message
3caa451

update to new error format E0409
193b9ae

Update E0005 to use a label
1fc18aa

Update E0005 Unit-Test
4cfdf63

Rollup merge ofrust-lang#34370- steveklabnik:keyword-ref-mention, r…
e83bff9
…=Manishearth A disclaimer about keywords. Some people cite this list as "zomg Rust has so many keywords," so make it clear that these aren't all used by the language today.

Rollup merge ofrust-lang#35415- silenuss:e0030-formatting, r=jonath…
d3f55e1
…andturner Update compiler error 0030 to use new error format. Part of rust-lang#35233, Addresses rust-lang#35204 r? @jonathandturner

Jonathan Turner added 9 commits August 17, 2016 06:25

Rollup merge ofrust-lang#35690- matthew-piziak:op-overloading-limit…
49a2873
…ed, r=steveklabnik expound on limitations of Rust's trait-based operator overloading Part of rust-lang#29330

Rollup merge ofrust-lang#35708- sanxiyn:new-error-format, r=nikomat…
6193b1f
…sakis RUST_NEW_ERROR_FORMAT is no more So stop setting the environment variable.

Rollup merge ofrust-lang#35713- sanxiyn:ui-test, r=nikomatsakis
75454f7
Use UI test to test spans, instead of forced line break There must be lots more, but these are what I could easily find.

Rollup merge ofrust-lang#35722- knight42:update-error-msg, r=jonath…
5fc58dc
…andturner Updated E0394 & E0422 to new format Fixesrust-lang#35692 and rust-lang#35700, as part of rust-lang#35233. r? @jonathandturner

Rollup merge ofrust-lang#35725- brson:bump, r=alexcrichton
e20a7e3
Bump version to 1.13

Rollup merge ofrust-lang#35726- mikhail-m1:master2, r=jonathandturner
fbc62af
update E0409 to new error format fixesrust-lang#35699 as part of rust-lang#35233. r? @jonathandturner

Rollup merge ofrust-lang#35731- pythoneer:fix-35192, r=jonathandturner
c216617
Update E0005 to use a label Fixesrust-lang#35192 as Part of rust-lang#35233 r? @jonathandturner

rust-highfive assigned brson Aug 17, 2016

bors merged commit c216617 into rust-lang:masterAug 17, 2016

This was referenced Aug 17, 2016
Add Span field for Generics structs #35591
Merged
Implement 1581 (FusedIterator) #35656
Merged
Replace macro backtraces with labeled local uses #35702
Merged
accumulate vector and assert for RangeFrom and RangeInclusive examples #35758
Merged

sophiajt deleted the rollup branch August 18, 2016 16:00

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

Centril unassigned brson Oct 2, 2019

Navigation Menu

Uh oh!

Uh oh!

Rollup of 23 pull requests - #35747

Rollup of 23 pull requests#35747
bors merged 51 commits into
rust-lang:masterfrom
sophiajt:rollup

sophiajt commented Aug 17, 2016

Uh oh!

rust-highfive commented Aug 17, 2016

Uh oh!

sophiajt commented Aug 17, 2016

Uh oh!

bors commented Aug 17, 2016

Uh oh!

bors commented Aug 17, 2016

Uh oh!

bors commented Aug 17, 2016

Uh oh!

sophiajt commented Aug 17, 2016

Uh oh!

sophiajt commented Aug 17, 2016

Uh oh!

bors commented Aug 17, 2016

Uh oh!

bors commented Aug 17, 2016

Uh oh!

bors commented Aug 17, 2016

Uh oh!

bors commented Aug 17, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Uh oh!

Uh oh!

Conversation

sophiajt commented Aug 17, 2016

Uh oh!

rust-highfive commented Aug 17, 2016

Uh oh!

sophiajt commented Aug 17, 2016

Uh oh!

bors commented Aug 17, 2016

Uh oh!

bors commented Aug 17, 2016

Uh oh!

bors commented Aug 17, 2016

Uh oh!

sophiajt commented Aug 17, 2016

Uh oh!

sophiajt commented Aug 17, 2016

Uh oh!

bors commented Aug 17, 2016

Uh oh!

bors commented Aug 17, 2016

Uh oh!

bors commented Aug 17, 2016

Uh oh!

bors commented Aug 17, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants