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 6 pull requests #42644

Merged
merged 14 commits into from
Jun 14, 2017
Merged

Rollup of 6 pull requests #42644

merged 14 commits into from
Jun 14, 2017

Commits on Jun 4, 2017

  1. Delegate str:Index(Mut) to SliceIndex<str>

    Move any extra logic that the former had into the latter, so they're consistent.
    scottmcm committed Jun 4, 2017
    Configuration menu
    Copy the full SHA
    18612b2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    808a08a View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2017

  1. Add max and min default fns to Ord trait

    Pursuant to issue rust-lang#25663, this commit adds the max and min functions to the Ord trait, enabling items that implement Ord to use UFCS (ex. 1.max(2)) instead of the longer std::cmp::max(1,2) format.
    Razaekel committed Jun 7, 2017
    Configuration menu
    Copy the full SHA
    2cadc32 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a32ffc6 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2017

  1. Capture elapsed duration in Thread::park_timeout example

    Mark Buer authored and Mark Buer committed Jun 12, 2017
    Configuration menu
    Copy the full SHA
    0389d40 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2017

  1. Configuration menu
    Copy the full SHA
    e759370 View commit details
    Browse the repository at this point in the history
  2. changed upper bound digit in octal rule to 7

    Arthur Arnold committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    c291e87 View commit details
    Browse the repository at this point in the history
  3. Add E0617

    GuillaumeGomez committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    a5dc963 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#42408 - bjorn3:patch-2, r=michaelwoerister

    Add docs to librustc/hir/check_attr.rs
    
    Also moved `check_attribute` up to ease reading.
    frewsxcv authored Jun 13, 2017
    Configuration menu
    Copy the full SHA
    02179bd View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#42428 - scottmcm:str-get-overflow, r=sfackler

    Add overflow checking for `str::get` with inclusive ranges
    
    Fixes rust-lang#42401
    
    Two commits here:
    
    1. The first makes `str::index` just call `SliceIndex<str>::index`.  It's intended to have no behavior change, except where the two methods were inconsistent.
    2. The second actually adds the overflow checking to `get(_mut)` (and tests for it)
    frewsxcv authored Jun 13, 2017
    Configuration menu
    Copy the full SHA
    78d5d37 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#42496 - Razaekel:feature/integer_max-min, r…

    …=BurntSushi
    
    Add max and min to Ord
    
    Pursuant to issue rust-lang#25663, this PR adds max and min methods with default implementations to std::cmp::Ord. It also modifies std::cmp::max|min to internally alias to Ord::max|min, so that any overrides of the default implementations are automatically used by std::cmp::max|min.
    
    Closes rust-lang#25663
    frewsxcv authored Jun 13, 2017
    Configuration menu
    Copy the full SHA
    7463cf5 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#42597 - mark-buer:park_timeout_example_fix,…

    … r=alexcrichton
    
    Capture elapsed duration in Thread::park_timeout example
    
    `beginning_park.elapsed()` might return a larger value within the loop as compared to that checked in the loop conditional.
    Since `Duration` arithmetic is checked, hitting such an edge case will cause a panic.
    frewsxcv authored Jun 13, 2017
    Configuration menu
    Copy the full SHA
    664ab45 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    d60b291 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#42638 - arthurpaimarnold:lexer_rule_for_oct…

    …al, r=petrochenkov
    
    Possible mistake in lexer rule for octal integer
    
    Original rule allowed for digits 0-8, but octal is 0-7.
    
    The compiler correctly prevents you from placing an 8 in an octal, so I'm assuming this is caught on a later stage. Still, shouldn't the lexer already catch this?
    frewsxcv authored Jun 13, 2017
    Configuration menu
    Copy the full SHA
    9242f22 View commit details
    Browse the repository at this point in the history