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 14 pull requests #36153

Closed
wants to merge 29 commits into from
Closed

Rollup of 14 pull requests #36153

wants to merge 29 commits into from

Commits on Aug 26, 2016

  1. accumulate vector and assert for RangeFrom and RangeInclusive examples

    PR rust-lang#35695 for `Range` was approved, so it seems that this side-effect-free style is preferred for Range* examples. This PR performs the same translation for `RangeFrom` and `RangeInclusive`. It also removes what looks to be an erroneously commented line for `#![feature(step_by)]`, and an unnecessary primitive-type annotation in `0u8..`.
    
    add `fn main` wrappers to enable Rust Playground "Run" button
    matthew-piziak committed Aug 26, 2016
    Configuration menu
    Copy the full SHA
    50e0fbc View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2016

  1. Add test for rust-lang#34053

    apasel422 committed Aug 28, 2016
    Configuration menu
    Copy the full SHA
    da566ae View commit details
    Browse the repository at this point in the history
  2. Add test for rust-lang#24204

    apasel422 committed Aug 28, 2016
    Configuration menu
    Copy the full SHA
    91bfa2c View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2016

  1. Configuration menu
    Copy the full SHA
    10b8e0e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c36ccf7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fb65fe9 View commit details
    Browse the repository at this point in the history
  4. add test for rust-lang#14875

    cristicbz committed Aug 30, 2016
    Configuration menu
    Copy the full SHA
    34e1817 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    77cd09a View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    150599d View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    37bf449 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    25c9097 View commit details
    Browse the repository at this point in the history
  9. add evocative examples for BitOr and BitXor

    These are exactly equivalent to PR rust-lang#35809, with one caveat: I do not believe there is a non-bitwise binary "xor" operator in Rust, so here it's expressed as (a || b) && !(a && b).
    
    r? @GuillaumeGomez
    
    improved documentation a la PR rust-lang#35993
    matthew-piziak committed Aug 30, 2016
    Configuration menu
    Copy the full SHA
    8ca9fa1 View commit details
    Browse the repository at this point in the history
  10. update E0265 to new format

    mikhail-m1 committed Aug 30, 2016
    Configuration menu
    Copy the full SHA
    507fe14 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    d3a6ea5 View commit details
    Browse the repository at this point in the history
  12. Bonus fix for rust-lang#35280. Part of rust-lang#35233. Fixes rust-la…

    …ng#36057. Adding expanded notes/context for what trait a parameter shadows as part of E0194 error messages.
    leikahing committed Aug 30, 2016
    Configuration menu
    Copy the full SHA
    fb38911 View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#35758 - matthew-piziak:vec-assert-over-prin…

    …tln-remaining, r=GuillaumeGomez
    
    accumulate vector and assert for RangeFrom and RangeInclusive examples
    
    PR rust-lang#35695 for `Range` was merged, so it seems that this side-effect-free style is preferred for Range* examples. This PR performs the same translation for `RangeFrom` and `RangeInclusive`. It also removes what looks to be an erroneously commented line for `#![feature(step_by)]`, and an unnecessary primitive-type annotation in `0u8..`.
    Jonathan Turner authored Aug 30, 2016
    Configuration menu
    Copy the full SHA
    f45a515 View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#35926 - matthew-piziak:bit-or-xor-examples,…

    … r=GuillaumeGomez
    
    add evocative examples for `BitOr` and `BitXor`
    
    These are exactly equivalent to PR rust-lang#35809, with one caveat: I do not believe there is a non-bitwise binary XOR operator in Rust, so here it's expressed as `(a || b) && !(a && b)`.
    
    Alternative decompositions are `(a && !b) || (!a && b)` and `(a || b) && (!a || !b)`.  Let me know if you think one of those would be clearer.
    
    r? @GuillaumeGomez
    Jonathan Turner authored Aug 30, 2016
    Configuration menu
    Copy the full SHA
    0c6edea View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#36050 - abhiQmar:e0076-formatting, r=jonath…

    …andturner
    
    Update compiler error E0076 to use new error format
    
    Fixes rust-lang#35221 part of rust-lang#35233
    
    r? @jonathandturner
    Jonathan Turner authored Aug 30, 2016
    Configuration menu
    Copy the full SHA
    7ad493a View commit details
    Browse the repository at this point in the history
  16. Rollup merge of rust-lang#36085 - apasel422:issue-34053, r=brson

    Add test for rust-lang#34053
    
    Closes rust-lang#34053
    Jonathan Turner authored Aug 30, 2016
    Configuration menu
    Copy the full SHA
    196d897 View commit details
    Browse the repository at this point in the history
  17. Rollup merge of rust-lang#36089 - apasel422:issue-24204, r=alexcrichton

    Add test for rust-lang#24204
    
    Closes rust-lang#24204
    Jonathan Turner authored Aug 30, 2016
    Configuration menu
    Copy the full SHA
    2eaa61d View commit details
    Browse the repository at this point in the history
  18. Rollup merge of rust-lang#36114 - zjhmale:fix-E0393, r=jonathandturner

    Update E0393 to new error format
    
    Fixes rust-lang#35632.
    Part of rust-lang#35233.
    
    r? @jonathandturner
    
    and a wired thing is that if i add another label
    
    ```rust
    .span_label(span, &format!("missing reference to `{}`", def.name))
    .span_label(span, &format!("because of the default `Self` reference, type parameters must be specified on object types"))
    ```
    
    and add a new note in the test case like
    
    ```rust
    trait A<T=Self> {}
    
    fn together_we_will_rule_the_galaxy(son: &A) {}
    //~^ ERROR E0393
    //~| NOTE missing reference to `T`
    //~| NOTE because of the default `Self` reference, type parameters must be specified on object types
    ```
    
    it will complain that
    
    ```
    running 1 test
    test [compile-fail] compile-fail/E0393.rs ... FAILED
    
    failures:
    
    ---- [compile-fail] compile-fail/E0393.rs stdout ----
    
    error: /Users/zjh/Documents/rustspace/rust/src/test/compile-fail/E0393.rs:13: unexpected "error": '13:43: 13:44: the type parameter `T` must be explicitly specified [E0393]'
    
    unexpected errors (from JSON output): [
        Error {
            line_num: 13,
            kind: Some(
                Error
            ),
            msg: "13:43: 13:44: the type parameter `T` must be explicitly specified [E0393]"
        }
    ]
    ```
    
    it is a little bit confusing and through the blog post we can use `//~^` and `//~|` to support multiple notes, @jonathandturner am i missing something here?
    Jonathan Turner authored Aug 30, 2016
    Configuration menu
    Copy the full SHA
    ae53641 View commit details
    Browse the repository at this point in the history
  19. Rollup merge of rust-lang#36130 - frewsxcv:patch-32, r=steveklabnik

    rustbook chapters/sections should be an ordered list.
    Jonathan Turner authored Aug 30, 2016
    Configuration menu
    Copy the full SHA
    aa4bf9a View commit details
    Browse the repository at this point in the history
  20. Rollup merge of rust-lang#36134 - tshepang:more-simple, r=steveklabnik

    doc: make TcpListener example more simple
    Jonathan Turner authored Aug 30, 2016
    Configuration menu
    Copy the full SHA
    1b5bf72 View commit details
    Browse the repository at this point in the history
  21. Rollup merge of rust-lang#36135 - 0xmohit:pr/error-code-E0520, r=jona…

    …thandturner
    
    Update E0520 to new error format
    
    Fixes rust-lang#36112.
    Part of rust-lang#35233.
    
    r? @jonathandturner
    Jonathan Turner authored Aug 30, 2016
    Configuration menu
    Copy the full SHA
    0ce3724 View commit details
    Browse the repository at this point in the history
  22. Rollup merge of rust-lang#36136 - athulappadan:E0034, r=jonathandturner

    Update compiler error 0034 to use new format.
    
    Part of rust-lang#35233
    Addresses rust-lang#35205
    
    r? @jonathandturner
    Jonathan Turner authored Aug 30, 2016
    Configuration menu
    Copy the full SHA
    e732d87 View commit details
    Browse the repository at this point in the history
  23. Rollup merge of rust-lang#36140 - cristicbz:test-14875, r=nagisa

    Add test for rust-lang#14875
    
    You can check this out in the playground https://is.gd/oVKC2T . It will fail on stable, but pass on nightly as @nagisa suggested on the issue.
    
    Fixes rust-lang#14875
    Jonathan Turner authored Aug 30, 2016
    Configuration menu
    Copy the full SHA
    b37e061 View commit details
    Browse the repository at this point in the history
  24. Rollup merge of rust-lang#36141 - GuillaumeGomez:err_codes, r=jonatha…

    …ndturner
    
    Err codes
    
    r? @jonathandturner
    Jonathan Turner authored Aug 30, 2016
    Configuration menu
    Copy the full SHA
    3a6acda View commit details
    Browse the repository at this point in the history
  25. Rollup merge of rust-lang#36147 - mikhail-m1:master, r=jonathandturner

    update E0265 to new format
    
    Fixes rust-lang#35309 as part of rust-lang#35233.
    I've describe partially bonus achieve in rust-lang#35309
    
    r? @jonathandturner
    Jonathan Turner authored Aug 30, 2016
    Configuration menu
    Copy the full SHA
    a755ac4 View commit details
    Browse the repository at this point in the history
  26. Rollup merge of rust-lang#36148 - birryree:E0194_bonus_format, r=jona…

    …thandturner
    
    Bonus format for E0194
    
    Bonus fix for rust-lang#35280. Part of rust-lang#35233. Fixes rust-lang#36057. Adding expanded notes/context for what trait a parameter shadows as part of E0194 error messages.
    
    Errors for E0194 now look like this:
    
    ```
    $> ./build/x86_64-apple-darwin/stage1/bin/rustc src/test/compile-fail/E0194.rs
    error[E0194]: type parameter `T` shadows another type parameter of the same name
      --> src/test/compile-fail/E0194.rs:13:26
       |
    11 | trait Foo<T> { //~ NOTE first `T` declared here
       |           - first `T` declared here
    12 |     fn do_something(&self) -> T;
    13 |     fn do_something_else<T: Clone>(&self, bar: T);
       |                          ^ shadows another type parameter
    
    error: aborting due to previous error
    ```
    
    r? @jonathandturner
    Jonathan Turner authored Aug 30, 2016
    Configuration menu
    Copy the full SHA
    e7c306d View commit details
    Browse the repository at this point in the history