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 23 pull requests #35592

Merged
merged 56 commits into from
Aug 12, 2016
Merged

Rollup of 23 pull requests #35592

merged 56 commits into from
Aug 12, 2016

Commits on Aug 4, 2016

  1. Provide a cleaner documentation for 'write!'

    Cengiz Can committed Aug 4, 2016
    Configuration menu
    Copy the full SHA
    15be66d View commit details
    Browse the repository at this point in the history
  2. Use consistent spelling for word 'implementor'

    Cengiz Can committed Aug 4, 2016
    Configuration menu
    Copy the full SHA
    800aa92 View commit details
    Browse the repository at this point in the history
  3. Be more explicit about duck typing

    Cengiz Can committed Aug 4, 2016
    Configuration menu
    Copy the full SHA
    c630bea View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2016

  1. Configuration menu
    Copy the full SHA
    751d43a View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2016

  1. Configuration menu
    Copy the full SHA
    abe1cc7 View commit details
    Browse the repository at this point in the history
  2. Updated the messages for E0017

    - Fix note message, fix tests.
    pcn committed Aug 7, 2016
    Configuration menu
    Copy the full SHA
    ec1ef79 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2016

  1. Configuration menu
    Copy the full SHA
    e28521e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bd2bd6c View commit details
    Browse the repository at this point in the history
  3. add test for issue rust-lang#29053

    Felix Rath committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    3c04ba2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    156c822 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    da8fed5 View commit details
    Browse the repository at this point in the history
  6. Update E0008 to new format

    srdja committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    0cb8439 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    0a98d73 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    ee076dd View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    ae9c09d View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2016

  1. Configuration menu
    Copy the full SHA
    b5ead00 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2adc07f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0e8ec43 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    71a34d7 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    20ea8cb View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    0a3564a View commit details
    Browse the repository at this point in the history
  7. Update E0007 to new format

    srdja committed Aug 9, 2016
    Configuration menu
    Copy the full SHA
    aa40ec7 View commit details
    Browse the repository at this point in the history
  8. E0128 update error format

    circuitfox committed Aug 9, 2016
    Configuration menu
    Copy the full SHA
    766a0ab View commit details
    Browse the repository at this point in the history
  9. E0263 updated to new format. rust-lang#35518

    Jakub Hlusička committed Aug 9, 2016
    Configuration menu
    Copy the full SHA
    46265a0 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2016

  1. Configuration menu
    Copy the full SHA
    70e760f View commit details
    Browse the repository at this point in the history
  2. Update E0133 to new format

    wdv4758h committed Aug 10, 2016
    Configuration menu
    Copy the full SHA
    e7065b7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e3ebe8b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    907a20c View commit details
    Browse the repository at this point in the history
  5. Update error format for E0326

    trixnz committed Aug 10, 2016
    Configuration menu
    Copy the full SHA
    034df94 View commit details
    Browse the repository at this point in the history
  6. Update error format for E0130

    trixnz committed Aug 10, 2016
    Configuration menu
    Copy the full SHA
    f656a92 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    e2cc157 View commit details
    Browse the repository at this point in the history
  8. E0072 update error format

    circuitfox committed Aug 10, 2016
    Configuration menu
    Copy the full SHA
    c5f9feb View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2016

  1. Rollup merge of rust-lang#35279 - cengizIO:master, r=brson

    Provide a cleaner documentation for 'write!'
    
    Hello!
    
    This is my attempt to fix rust-lang#35110
    
    Any feedback is more than welcome!
    
    Cheers!
    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    476e496 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#35331 - trixnz:update-error-130, r=jonathan…

    …dturner
    
    Update error format for E0130
    
    Fixes rust-lang#35256 as part of rust-lang#35233
    
    r? @jonathandturner
    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    260a379 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#35358 - vadimcn:vscode, r=steveklabnik

    Ignore VS Code settings directory
    
    r? @steveklabnik
    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    0fecdc5 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#35375 - trixnz:update-error-326, r=jonathan…

    …dturner
    
    Update error format for E0326
    
    Fixes rust-lang#35335 as part of rust-lang#35233
    
    r? @jonathandturner
    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    e24c326 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#35445 - pcn:update-E0017-to-new-format, r=a…

    …rielb1
    
    Update e0017 to new format
    
    Updated `span_err!` to use `struct_span_err!` and provide a `span_label` that describes the error in context.
    
    Updated the test to look for the `span_label`s that are provided now.
    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    d2e9573 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#35448 - srinivasreddy:rf_compiletest, r=nik…

    …omatsakis
    
    run rustfmt on compiletest folder in src/tools/ folder
    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    b179042 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#35482 - frewsxcv:patch-31, r=GuillaumeGomez

    Remove unnecessary `main` functions in doc examples.
    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    d423c25 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#35486 - KiChjang:e0081-bonus, r=jonathandtu…

    …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
    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    853fe86 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#35505 - futile:test_29053, r=nikomatsakis

    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
    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    ea34254 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#35528 - Vassah:master, 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
    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    0283443 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#35530 - srdja:master, r=jonathandturner

    Update E0008 and E0007 to new format
    
    Part of rust-lang#35233
    A fix for rust-lang#35496
    
    r? @jonathandturner
    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    c7513d7 View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#35532 - KiChjang:e0004-follow-up, r=jonatha…

    …ndturner
    
    Do not span across nodes for E0004
    
    Part of rust-lang#35233.
    Fixes rust-lang#35529.
    
    r? @arielb1
    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    d0922f6 View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#35536 - hank-der-hafenarbeiter:E0433, r=jon…

    …athandturner
    
    Updated E0433 to new error message. (no bonus)
    
    Part of rust-lang#35345
    r? @jonathandturner
    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    294ac7b View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#35537 - munyari:e0038, 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
    ```
    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    8d63269 View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#35541 - hank-der-hafenarbeiter:E0045, r=jon…

    …athandturner
    
    Updated E0045 to new error format (no bonus)
    
    Part of rust-lang#35501
    r? @jonathandturner
    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    08d5df8 View commit details
    Browse the repository at this point in the history
  16. Rollup merge of rust-lang#35552 - theypsilon:master, r=jonathandturner

    Update error message E0384 to new format
    
    Part of rust-lang#35233
    Fixes rust-lang#35184
    
    r? @jonathandturner
    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    b758688 View commit details
    Browse the repository at this point in the history
  17. Rollup merge of rust-lang#35554 - murarth:insert-str-issue, r=apasel422

    Add tracking issue for `String::insert_str`
    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    b76ca89 View commit details
    Browse the repository at this point in the history
  18. Rollup merge of rust-lang#35555 - circuitfox:E0128-update-error-forma…

    …t, r=jonathandturner
    
    E0128 update error format
    
    Fixes rust-lang#35508
    
    Part of rust-lang#35233
    
    r? @jonathandturner
    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    a5408a5 View commit details
    Browse the repository at this point in the history
  19. Rollup merge of rust-lang#35557 - Limeth:master, r=jonathandturner

    E0263 updated to new format.
    
    Fixes rust-lang#35518. Part of rust-lang#35233.
    r? @jonathandturner
    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    aaed538 View commit details
    Browse the repository at this point in the history
  20. Rollup merge of rust-lang#35562 - birkenfeld:as-mut-doc, r=steveklabnik

    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
    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    6692f41 View commit details
    Browse the repository at this point in the history
  21. Rollup merge of rust-lang#35565 - wdv4758h:E0133, r=jonathandturner

    Update E0133 to new format
    
    Part of rust-lang#35233
    Fix rust-lang#35509
    r? @jonathandturner
    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    efbed8b View commit details
    Browse the repository at this point in the history
  22. Rollup merge of rust-lang#35569 - pietroalbini:fix-typo, r=steveklabnik

    Fix docs typo in std::os::unix::net::SocketAddr::is_unnamed
    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    0e92c5e View commit details
    Browse the repository at this point in the history
  23. Rollup merge of rust-lang#35576 - circuitfox:E0072-update-error-forma…

    …t, r=jonathandturner
    
    E0072 update error format
    
    Part of  rust-lang#35233
    
    Fixes rust-lang#35506
    
    r? @jonathandturner
    
    The bonus for this issue currently seems to be impossible to do reliably, as the compiler seems to lack span information for item names alone, like `Foo` in `struct Foo { ... }`. It would be possible to hack something together by computing span offsets, but that seems like a solution that would be begging for trouble.
    
    A proper solution to this would, of course, be to add span information to the right place (seems to be `rustc::hir::Item::name` but I may be wrong).
    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    cdedad5 View commit details
    Browse the repository at this point in the history
  24. Fix tidy warning

    Jonathan Turner committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    d3af9a3 View commit details
    Browse the repository at this point in the history