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 11 pull requests #22842

Closed
wants to merge 25 commits into from
Closed

Commits on Feb 23, 2015

  1. Configuration menu
    Copy the full SHA
    0685e7a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f49fd40 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2015

  1. std: Require &mut self for Iterator::all

    Keeps the method consistent with `Iterator::any`.
    
    Closes rust-lang#22617
    [breaking-change]
    alexcrichton committed Feb 25, 2015
    Configuration menu
    Copy the full SHA
    18878b1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    64581cf View commit details
    Browse the repository at this point in the history
  3. Change MarkerTrait to be invariant. This is a (small) loss of express…

    …iveness,
    
    but is necessary for now to work around rust-lang#22806. Fixes rust-lang#22655.
    nikomatsakis committed Feb 25, 2015
    Configuration menu
    Copy the full SHA
    7074346 View commit details
    Browse the repository at this point in the history
  4. Result::or : avoid over-specializing the type

    Changes .or() so that it can return a Result with a different E type
    than the one it is called on.
    
    Essentially:
    
        fn or(self, res: Result<T, E>) -> Result<T, E>
    
    becomes
    
        fn or<F>(self, res: Result<T, F>) -> Result<T, F>
    
    This brings `or` in line with the existing `and` and `or_else` member
    types.
    
    This is a
    [breaking-change]
    Due to some code needing additional type annotations.
    codyps committed Feb 25, 2015
    Configuration menu
    Copy the full SHA
    07dc8d6 View commit details
    Browse the repository at this point in the history
  5. Fix overflow in precise_time_ns() on Windows,

    which starts happening after ~2 hours of machine uptime.
    vadimcn committed Feb 25, 2015
    Configuration menu
    Copy the full SHA
    5dd001b View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2015

  1. Configuration menu
    Copy the full SHA
    65b0655 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f618e2e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d9bdc43 View commit details
    Browse the repository at this point in the history
  4. remove the redundant else branch

    The branch "else { continue }" is the last code inside a loop body,
    it is just useless.
    
    Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
    Lai Jiangshan committed Feb 26, 2015
    Configuration menu
    Copy the full SHA
    9cdb256 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    704ce1d View commit details
    Browse the repository at this point in the history
  6. Add check for unbounded due to non-regular types in dropck.

    (Regression tests are in followup commit.)
    pnkfelix committed Feb 26, 2015
    Configuration menu
    Copy the full SHA
    c3b8125 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    ed18e6b View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    e87cc59 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#22748 - jxcl:string-backslash, r=steveklabnik

    r? @steveklabnik 
    
    Closes rust-lang#22698
    
    I wasn't sure that this was appropriate for the book, but I've added this to the reference. I also noticed that one of the U+ symbols in the character literals section was missing the graves.
    steveklabnik committed Feb 26, 2015
    Configuration menu
    Copy the full SHA
    9b041b7 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#22764 - ivanradanov:fileline_help, r=huonw

    When warnings and errors occur, the associated help message should not print the same code snippet.
    rust-lang#21938
    steveklabnik committed Feb 26, 2015
    Configuration menu
    Copy the full SHA
    839f0a3 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#22777 - pnkfelix:issue-22443, r=nikomatsakis

    Check for unbounded recursion during dropck.
    
    Such recursion can be introduced by the erroneous use of non-regular types (aka types employing polymorphic recursion), which Rust does not support.
    
    Fix rust-lang#22443
    steveklabnik committed Feb 26, 2015
    Configuration menu
    Copy the full SHA
    41c6c35 View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#22788 - vadimcn:fix-precise_time_ns, r=pnkf…

    …elix
    
    which starts happening after ~2 hours of machine uptime.
    Closes rust-lang#17845
    steveklabnik committed Feb 26, 2015
    Configuration menu
    Copy the full SHA
    152e490 View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#22795 - alexcrichton:issue-22617, r=huonw

    Keeps the method consistent with `Iterator::any`.
    
    Closes rust-lang#22617
    [breaking-change]
    steveklabnik committed Feb 26, 2015
    Configuration menu
    Copy the full SHA
    50a2225 View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#22809 - nikomatsakis:issue-22655-infinite-r…

    …ecursion, r=pnkfelix
    
    Change MarkerTrait to be invariant. This is a (small) loss of expressiveness, but is necessary for now to work around rust-lang#22806. Fixes rust-lang#22655.
    
    r? @pnkfelix
    steveklabnik committed Feb 26, 2015
    Configuration menu
    Copy the full SHA
    5883d63 View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#22817 - jmesmon:result-or-type, r=huonw

    Changes .or() so that it can return a Result with a different E type
    than the one it is called on.
    
    Essentially:
    
        fn or(self, res: Result<T, E>) -> Result<T, E>
    
    becomes
    
        fn or<F>(self, res: Result<T, F>) -> Result<T, F>
    
    This brings `or` in line with the existing `and` & `or_else`
    
    This is a
    [breaking-change]
    Due to some code needing additional type annotations.
    steveklabnik committed Feb 26, 2015
    Configuration menu
    Copy the full SHA
    66ced05 View commit details
    Browse the repository at this point in the history
  16. Rollup merge of rust-lang#22824 - bossmc:build-warnings, r=alexcrichton

    Simple PR to fix some build warnings on a clean clone of master.
    
    ```
    /home/ubuntu/src/rust/src/librustc/middle/astconv_util.rs:71:51: 71:53 warning: obsolete syntax: []
    /home/ubuntu/src/rust/src/librustc/middle/astconv_util.rs:71             Some(prim_ty_to_ty(tcx, &path.segments[], nty))
                                                                                                                   ^~
    note: write `[..]` instead
    ...
    /home/ubuntu/src/rust/src/librustc_resolve/lib.rs:2988:53: 2988:55 warning: obsolete syntax: []
    /home/ubuntu/src/rust/src/librustc_resolve/lib.rs:2988             self.resolve_error(trait_path.span, &msg[]);
                                                                                                               ^~
    note: write `[..]` instead
    ```
    steveklabnik committed Feb 26, 2015
    Configuration menu
    Copy the full SHA
    b8d6a81 View commit details
    Browse the repository at this point in the history
  17. Rollup merge of rust-lang#22833 - laijs:remove-redundant-else-branch,…

    … r=dotdash
    
    The branch "else { continue }" is the last code inside a loop body,
    it is just useless.
    
    Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
    steveklabnik committed Feb 26, 2015
    Configuration menu
    Copy the full SHA
    fa66eb3 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    f943de9 View commit details
    Browse the repository at this point in the history