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 #35525

Merged
merged 33 commits into from
Aug 10, 2016
Merged

Rollup of 15 pull requests #35525

merged 33 commits into from
Aug 10, 2016

Conversation

mgattozzi and others added 30 commits August 5, 2016 11:34
Because of changes to how Rust acquires randomness HashMap is not
guaranteed to be DoS resistant. This commit reflects these changes in
the docs themselves and provides an alternative method to creating
a hash that is resistant if needed.
Added some extra code to check for the appropriate ending for numbers ==
1 vs. not 1 in error messages.

Added an extra test so that the plural suffix is seen and exercised.
Add the unstable `:` colon and `<-` inplace operators.
When using Point { x: 0, y: 0 } and showing pattern matching decomposing
x and y individually its hard to understand. By using a different value
for x and a different value for y it is more clear.
Update HashMap docs regarding DoS protection

Because of changes to how Rust acquires randomness HashMap is not
guaranteed to be DoS resistant. This commit reflects these changes in
the docs themselves and provides an alternative method to creating
a hash that is resistant if needed.

This fixes rust-lang#33817 and includes relevant information regarding changes made in rust-lang#33086
…onathandturner

Update E0023 to the new format

Added some extra code to check for the appropriate ending for numbers ==
1 vs. not 1 in error messages.

Added an extra test so that the plural suffix is seen and exercised.
Finish fixing the operator precedence tables

Add the unstable `:` colon and `<-` inplace operators.

r? @steveklabnik
…lexcrichton

Add run-pass test for issue 33498

Fixes rust-lang#33498.

r? @alexcrichton
…klabnik

book: update example patterns to be more clear

When using Point { x: 0, y: 0 } and showing pattern matching decomposing
x and y individually its hard to understand. By using a different value
for x and a different value for y it is more clear.
book: fix formatting of module layout example
…ndturner

Fix E0132 error display

Error and note now use the same span.

r? @jonathandturner
Shrink E0205 span label to the trait being implemented

Part of rust-lang#35233.
Extension of rust-lang#35468.
Closes rust-lang#35382.

r? @GuillaumeGomez
…t, r=jonathandturner

Updated E0026 to new format.

Part of rust-lang#35233.
Fixes rust-lang#35497.

r? @jonathandturner
Jonathan Turner added 2 commits August 8, 2016 13:25
…nathandturner

Updated Error mesage to new format for E0221

Part of rust-lang#35386
r? @jonathandturner
…ormat, r=jonathandturner

Update E0162 to the new format

Part of rust-lang#35233.
Fixes rust-lang#35268.

r? @jonathandturner
@rust-highfive
Copy link
Collaborator

r? @arielb1

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

@sophiajt
Copy link
Contributor Author

sophiajt commented Aug 8, 2016

@bors r+

@bors
Copy link
Contributor

bors commented Aug 8, 2016

📌 Commit f835b38 has been approved by jonathandturner

@sanxiyn
Copy link
Member

sanxiyn commented Aug 9, 2016

#35449 failed tidy.

@sophiajt
Copy link
Contributor Author

sophiajt commented Aug 9, 2016

Fixed tidy warning

@bors r+

@bors
Copy link
Contributor

bors commented Aug 9, 2016

📌 Commit fb1c6ac has been approved by jonathandturner

@steveklabnik
Copy link
Member

@bors: p=1

@bors
Copy link
Contributor

bors commented Aug 10, 2016

⌛ Testing commit fb1c6ac with merge 1f2ae38...

bors added a commit that referenced this pull request Aug 10, 2016
@bors bors merged commit fb1c6ac into rust-lang:master Aug 10, 2016
@bors bors mentioned this pull request Aug 10, 2016
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 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.