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 4 pull requests #64281

Merged
merged 8 commits into from
Sep 8, 2019
Merged

Rollup of 4 pull requests #64281

merged 8 commits into from
Sep 8, 2019

Commits on Sep 4, 2019

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

Commits on Sep 6, 2019

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

Commits on Sep 7, 2019

  1. Configuration menu
    Copy the full SHA
    7dc3839 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fb38708 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2019

  1. Rollup merge of rust-lang#62205 - timvermeulen:iter_order_by, r=KodrAus

    Add Iterator comparison methods that take a comparison function
    
    This PR adds `Iterator::{cmp_by, partial_cmp_by, eq_by, ne_by, lt_by, le_by, gt_by, ge_by}`. We already have `Iterator::{cmp, partial_cmp, ...}` which are less general (but not any simpler) than the ones I'm proposing here.
    
    I'm submitting this PR now because rust-lang#61505 has been merged, so this change should not have a noticeable effect on the `Iterator` docs page size.
    
    The diff is quite messy, here's what I changed:
    - The logic of `cmp` / `partial_cmp` / `eq` is moved to `cmp_by` / `partial_cmp_by` / `eq_by` respectively, changing `x.cmp(&y)` to `cmp(&x, &y)` in the `cmp` method where `cmp` is the given comparison function (and similar for `partial_cmp_by` and `eq_by`).
    - `ne_by` / `lt_by` / `le_by` / `gt_by` / `ge_by` are each implemented in terms of one of the three methods above.
    - The existing comparison methods are each forwarded to their `_by` counterpart, passing one of `Ord::cmp` / `PartialOrd::partial_cmp` / `PartialEq::eq` as the comparison function.
    
    The corresponding `_by_key` methods aren't included because they're not as fundamental as the `_by` methods and can easily be implemented in terms of them. Is that reasonable, or would adding the `_by_key` methods be desirable for the sake of completeness?
    
    I didn't add any tests – I couldn't think of any that weren't already covered by our existing tests. Let me know if there's a particular test that would be useful to add.
    Centril authored Sep 8, 2019
    Configuration menu
    Copy the full SHA
    0ac09ae View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#64152 - cramertj:update-backtrace, r=alexcr…

    …ichton
    
    Use backtrace formatting from the backtrace crate
    
    r? @alexcrichton
    Centril authored Sep 8, 2019
    Configuration menu
    Copy the full SHA
    2417208 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#64265 - petrochenkov:useerr, r=estebank

    resolve: Mark more erroneous imports as used
    
    Fixes rust-lang#63724
    r? @estebank
    Centril authored Sep 8, 2019
    Configuration menu
    Copy the full SHA
    3a32803 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#64267 - ehuss:rustdoc-fix-mixed-code-block,…

    … r=GuillaumeGomez
    
    rustdoc: fix diagnostic with mixed code block styles
    
    This fixes a relatively obscure issue where the diagnostic (emitted [here](https://github.com/rust-lang/rust/blame/ef54f57c5b9d894a38179d09b00610c1b337b086/src/librustdoc/passes/check_code_block_syntax.rs#L69)) would get confused since the "is_fenced" flag wasn't reset properly.
    Centril authored Sep 8, 2019
    Configuration menu
    Copy the full SHA
    832b47a View commit details
    Browse the repository at this point in the history