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 9 pull requests #36635

Closed
wants to merge 20 commits into from
Closed

Rollup of 9 pull requests #36635

wants to merge 20 commits into from

Commits on Sep 16, 2016

  1. fix top level attr spans

    mikhail-m1 committed Sep 16, 2016
    Configuration menu
    Copy the full SHA
    82639d4 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2016

  1. Fix name of error test file

    aclarry committed Sep 18, 2016
    Configuration menu
    Copy the full SHA
    af67f0b View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2016

  1. Configuration menu
    Copy the full SHA
    313fb8f View commit details
    Browse the repository at this point in the history
  2. Add the ability to merge spans to codemap

    Jonathan Turner committed Sep 19, 2016
    Configuration menu
    Copy the full SHA
    2ea3ab3 View commit details
    Browse the repository at this point in the history
  3. fixed the safety header/wording in option.rs

    jacobpadkins committed Sep 19, 2016
    Configuration menu
    Copy the full SHA
    8b02aa1 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2016

  1. Lazily allocate TypedArena's first chunk.

    Currently `TypedArena` allocates its first chunk, which is usually 4096
    bytes, as soon as it is created. If no allocations are ever made from
    the arena then this allocation (and the corresponding deallocation) is
    wasted effort.
    
    This commit changes `TypedArena` so it doesn't allocate the first chunk
    until the first allocation is made.
    
    This change speeds up rustc by a non-trivial amount because rustc uses
    `TypedArena` heavily: compilation speed (producing debug builds) on
    several of the rustc-benchmarks increases by 1.02--1.06x. The change
    should never cause a slow-down because the hot `alloc` function is
    unchanged. It does increase the size of `TypedArena` by one `usize`
    field, however.
    
    The commit also fixes some out-of-date comments.
    nnethercote committed Sep 20, 2016
    Configuration menu
    Copy the full SHA
    80a4477 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    429ba7b View commit details
    Browse the repository at this point in the history
  3. Update E0560 to include label

    aclarry committed Sep 20, 2016
    Configuration menu
    Copy the full SHA
    23efc54 View commit details
    Browse the repository at this point in the history
  4. Check for overlapping and simplify unit test

    Jonathan Turner committed Sep 20, 2016
    Configuration menu
    Copy the full SHA
    e4b1842 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2016

  1. Tweak std::rc docs

    kmcallister committed Sep 21, 2016
    Configuration menu
    Copy the full SHA
    c316ae5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8b8681e View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#36330 - aclarry:e0560-update, r=jonathandtu…

    …rner
    
    Updated E0560 to new error format
    
    Added a small bit of code to add a label for E0560.
    
    Also renamed src/test/compile-fail/E560.rs file to E0560.rs (not sure why it was named E560).
    Updated all test cases which check this error.
    
    Closes rust-lang#36199
    Jonathan Turner authored Sep 21, 2016
    Configuration menu
    Copy the full SHA
    aa22135 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#36539 - mikhail-m1:36530, r=jonathandturner

    fix top level attr spans
    
    issue rust-lang#36530
    ?r @jonathandturner
    Jonathan Turner authored Sep 21, 2016
    Configuration menu
    Copy the full SHA
    60d08ea View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#36571 - kmcallister:rust-langgh-29372-rc-do…

    …cs, r=GuillaumeGomez
    
    Tweak std::rc docs
    
    Fixes rust-lang#29372.
    
    r? @GuillaumeGomez
    Jonathan Turner authored Sep 21, 2016
    Configuration menu
    Copy the full SHA
    57c745d View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#36578 - GuillaumeGomez:fix_typo, r=stevekla…

    …bnik
    
    Replace 'e.g.' by 'i.e.'
    
    Fixes rust-lang#36577.
    
    r? @steveklabnik
    Jonathan Turner authored Sep 21, 2016
    Configuration menu
    Copy the full SHA
    5e7fbc4 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#36585 - jonathandturner:misc_error_touchups…

    …, r=nrc
    
    Add the ability to merge spans to codemap
    
    This PR adds the ability to merge Spans.  To do so, it builds on the Codemap's ability to verify the locations of spans, namely that following can be verified:
    
    * the expn_id of both spans much match
    * the lhs span needs to end on the same line the rhs span begins
    * the lhs span must start at or before the rhs span
    
    If all of these are met, a new span is returned that is min(lo), max(hi) of the two spans.
    
    This PR also removes an older Span merge, as this new functionality subsumes it.
    
    r? @nrc
    Jonathan Turner authored Sep 21, 2016
    Configuration menu
    Copy the full SHA
    e904292 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#36589 - jpadkins:option_docs_safety_wording…

    …_fix, r=bluss
    
    fixed the safety header/wording in option.rs
    
    Fixes rust-lang#36581
    
    screenshot of the rendered documentation: http://imgur.com/14kLVrA
    
    r? @steveklabnik
    Jonathan Turner authored Sep 21, 2016
    Configuration menu
    Copy the full SHA
    ae315da View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#36592 - nnethercote:TypedArena, r=bluss

    Lazily allocate TypedArena's first chunk
    
    Currently `TypedArena` allocates its first chunk, which is usually 4096
    bytes, as soon as it is created. If no allocations are ever made from
    the arena then this allocation (and the corresponding deallocation) is
    wasted effort.
    
    This commit changes `TypedArena` so it doesn't allocate the first chunk
    until the first allocation is made.
    
    This change speeds up rustc by a non-trivial amount because rustc uses
    `TypedArena` heavily: compilation speed (producing debug builds) on
    several of the rustc-benchmarks increases by 1.02--1.06x. The change
    should never cause a slow-down because the hot `alloc` function is
    unchanged. It does increase the size of `TypedArena` by one `usize`
    field, however.
    
    The commit also fixes some out-of-date comments.
    Jonathan Turner authored Sep 21, 2016
    Configuration menu
    Copy the full SHA
    5457fde View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#36600 - caipre:sort-by-key-comment-fix, r=a…

    …pasel422
    
    Minor correction in `sort_by_key` doc comment
    
    The parameter to `sort_by_key` is named `f`, not `key`.
    Jonathan Turner authored Sep 21, 2016
    Configuration menu
    Copy the full SHA
    9c469ff View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#36631 - frewsxcv:dir-entry-debug, r=sfackler

    Implement Debug for DirEntry.
    
    None
    Jonathan Turner authored Sep 21, 2016
    Configuration menu
    Copy the full SHA
    9b25f10 View commit details
    Browse the repository at this point in the history