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 33 pull requests #35571

Closed
wants to merge 74 commits into from
Closed

Conversation

steveklabnik
Copy link
Member

Cengiz Can and others added 30 commits August 4, 2016 03:11
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.
- Fix note message, fix tests.
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.
…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
Remove unnecessary `main` functions in doc examples.
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
…rner

Shrink span to variant discriminant expression for E0081

Part of rust-lang#35233.
Extension of rust-lang#35353.
Fixes rust-lang#35224.

r? @jonathandturner
…t, r=jonathandturner

Updated E0026 to new format.

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

r? @jonathandturner
Add test for issue rust-lang#29053

This PR adds a test for rust-lang#29053 (currently fails on stage 0, but works with stage 1, as it should).

Fixes rust-lang#29053
…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
Update Error Format for E0091 and E0092

Addresses [rust-lang#35228](rust-lang#35228) and [rust-lang#35229](rust-lang#35229) as part of [rust-lang#35233](rust-lang#35233).

Please let me know if there are any issues; first time contributor.

r? @jonathandturner
…athandturner

Updated E0433 to new error message. (no bonus)

Part of rust-lang#35345
r? @jonathandturner
Update E0038 to the new error format

Part of rust-lang#35233

Addresses rust-lang#35500
"r? @jonathandturner

This doesn't compile yet, and I need help. In my naive solution, adding the span label makes our error message a mutable `errors::DiagnosticBuilder` pointer.

```bash
python src/bootstrap/bootstrap.py --step check-cfail E0038 --stage 1
```

```
Building stage0 std artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
Building stage0 test artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
Building stage0 compiler artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
   Compiling rustc v0.0.0 (file:///home/nash/code/rust/src/librustc)
src/librustc/traits/error_reporting.rs:735:9: 735:12 error: mismatched types [E0308]
src/librustc/traits/error_reporting.rs:735         err
                                                   ^~~
src/librustc/traits/error_reporting.rs:735:9: 735:12 help: run `rustc --explain E0308` to see a detailed explanation
src/librustc/traits/error_reporting.rs:735:9: 735:12 note: expected type `core::option::Option<errors::DiagnosticBuilder<'tcx>>`
src/librustc/traits/error_reporting.rs:735:9: 735:12 note:    found type `core::option::Option<&mut errors::DiagnosticBuilder<'_>>`
error: aborting due to previous error
error: Could not compile `rustc`.

To learn more, run the command again with --verbose.

command did not execute successfully: "/home/nash/code/rust/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "-j" "4" "--target" "x86_64-unknown-linux-gnu" "--release" "--features" " jemalloc" "--manifest-path" "/home/nash/code/rust/src/rustc/Cargo.toml"
expected success, got: exit code: 101
```
…athandturner

Updated E0045 to new error format (no bonus)

Part of rust-lang#35501
r? @jonathandturner
Add tracking issue for `String::insert_str`
Remove redundant `&mut ref mut` in doc for Result::as_mut()

While a good example of how `&mut ref mut` is a no-op, I don't think we should show that here :)
See https://users.rust-lang.org/t/mnemonic-for-reading-qualifiers/6853

r? @steveklabnik
@rust-highfive
Copy link
Collaborator

r? @aturon

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

@steveklabnik
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Aug 10, 2016

📌 Commit 0db7846 has been approved by steveklabnik

@steveklabnik
Copy link
Member Author

oh wait, i did not see #35525 due to lack of priority

@Centril Centril added the rollup A PR which is a rollup label Oct 24, 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.