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 #68659

Merged
merged 18 commits into from
Jan 30, 2020
Merged

Rollup of 6 pull requests #68659

merged 18 commits into from
Jan 30, 2020

Commits on Dec 23, 2019

  1. Configuration menu
    Copy the full SHA
    293cdf7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f547978 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8651aa0 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2020

  1. Format safety comment as per tidy

    Co-Authored-By: Ashley Mannix <ashleymannix@live.com.au>
    crgl and KodrAus committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    3caa17b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    60a7c94 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    81b6f8c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6c3e477 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2020

  1. Use termize instead of term_size

    Zoxc committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    b0b11d3 View commit details
    Browse the repository at this point in the history
  2. BTreeMap: tag and explain unsafe internal functions or assert precond…

    …itions
    
    Co-Authored-By: Mark Rousskov <mark.simulacrum@gmail.com>
    ssomers committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    ba87a50 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ab5e296 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    684bd50 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ee73259 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2020

  1. Rollup merge of rust-lang#66648 - crgl:btree-clone-from, r=Amanieu

    Implement clone_from for BTreeMap and BTreeSet
    
    See rust-lang#28481. This results in up to 90% speedups on simple data types when `self` and `other` are the same size, and is generally comparable or faster. Some concerns:
    
    1. This implementation requires an `Ord` bound on the `Clone` implementation for `BTreeMap` and `BTreeSet`. Since these structs can only be created externally for keys with `Ord` implemented, this should be fine? If not, there's certainly a less safe way to do this.
    2. Changing `next_unchecked` on `RangeMut` to return mutable key references allows for replacing the entire overlapping portion of both maps without changing the external interface in any way. However, if `clone_from` fails it can leave the `BTreeMap` in an invalid state, which might be unacceptable.
    
    ~This probably needs an FCP since it changes a trait bound, but (as far as I know?) that change cannot break any external code.~
    Dylan-DPC committed Jan 30, 2020
    Configuration menu
    Copy the full SHA
    12c9562 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#68468 - ssomers:btreemap_prefer_middle, r=M…

    …ark-Simulacrum
    
    BTreeMap: tag and explain unsafe internal functions or assert preconditions
    
    rust-lang#68418 concluded that it's not desirable to tag all internal functions with preconditions as being unsafe. This PR does it to some functions, documents why, and elsewhere enforces the preconditions with asserts.
    Dylan-DPC committed Jan 30, 2020
    Configuration menu
    Copy the full SHA
    f837c73 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#68626 - Zoxc:termize, r=estebank

    Use termize instead of term_size
    
    `termize` is a fork of `term_size` which uses `winapi` 0.3 instead of 0.2. This is a step towards removing the `winapi` 0.2 dependency.
    
    r? @Mark-Simulacrum
    Dylan-DPC committed Jan 30, 2020
    Configuration menu
    Copy the full SHA
    4af33a9 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#68640 - LeSeulArtichaut:doc-from-ip, r=stev…

    …eklabnik
    
    Document remaining undocumented `From` implementations for IPs
    
    Some `From` implementations were missing documentation. I added examples, I tried to be as close to existing examples as possible.
    
    Related to rust-lang#51430 (cc @skade)
    
    r? @steveklabnik
    Dylan-DPC committed Jan 30, 2020
    Configuration menu
    Copy the full SHA
    3df1ff2 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#68651 - LeSeulArtichaut:doc-from-nonzero, r…

    …=steveklabnik
    
    Document `From` implementation for NonZero nums
    
    This is more of a nitpick than a real change in documentation. I did this for consistency with other documentation (namely Atomic integers).
    
    Related to rust-lang#51430
    
    r? @steveklabnik
    
    PS: I actually tested the code this time. My CPU died in the process, but I get to open a (hopefully 🤞) working PR
    Dylan-DPC committed Jan 30, 2020
    Configuration menu
    Copy the full SHA
    1780f2f View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#68655 - tmiasko:rev, r=Dylan-DPC

    Fix revision annotations in borrowck-feature-nll-overrides-migrate
    Dylan-DPC committed Jan 30, 2020
    Configuration menu
    Copy the full SHA
    9f497f9 View commit details
    Browse the repository at this point in the history