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 7 pull requests #42952

Closed
wants to merge 16 commits into from

Commits on Jun 22, 2017

  1. Configuration menu
    Copy the full SHA
    8205c34 View commit details
    Browse the repository at this point in the history
  2. Update docs for fmt::write.

    I reworded it slightly to make it more clear that the function only take
    two arguments - the output and the Arguments struct that can be
    generated from the format_args! macro.
    
    r? @steveklabnik
    rthomas committed Jun 22, 2017
    Configuration menu
    Copy the full SHA
    b9a44fc View commit details
    Browse the repository at this point in the history
  3. Update docs for std::fmt::format rust-lang#29355.

    This rewords and removes the `Arguments` section from the docs for
    fmt::format.
    
    r? @steveklabnik
    rthomas committed Jun 22, 2017
    Configuration menu
    Copy the full SHA
    c5d078f View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2017

  1. Improve sort tests and benchmarks

    Stjepan Glavina committed Jun 24, 2017
    Configuration menu
    Copy the full SHA
    12205f1 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2017

  1. std: Fix implementation of Alloc::alloc_one

    This had an accidental `u8 as *mut T` where it was intended to have just a
    normal pointer-to-pointer cast.
    
    Closes rust-lang#42827
    alexcrichton committed Jun 25, 2017
    Configuration menu
    Copy the full SHA
    d24d408 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2017

  1. Move thread_rng() outside the loop

    Stjepan Glavina committed Jun 26, 2017
    Configuration menu
    Copy the full SHA
    723833f View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2017

  1. Document possible io::ErrorKinds of fs::open

    Try to make clear that this isn't an API guarantee for now, as we likely
    want to refine these errors in the future, e.g. `ENOSPC` "No space left
    on device".
    
    CC rust-lang#40322
    tbu- committed Jun 27, 2017
    Configuration menu
    Copy the full SHA
    71252d9 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2017

  1. Fix link reference

    AndiDog authored Jun 28, 2017
    Configuration menu
    Copy the full SHA
    4fb67dc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2783d0f View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#42826 - Yorwba:type-mismatch-same-absolute-…

    …paths, r=arielb1
    
    Note different versions of same crate when absolute paths of different types match.
    
    The current check to address rust-lang#22750 only works when the paths of the mismatched types relative to the current crate are equal, but this does not always work if one of the types is only included through an indirect dependency. If reexports are involved, the indirectly included path can e.g. [contain private modules](rust-lang#22750 (comment)).
    
    This PR takes care of these cases by also comparing the *absolute* path, which is equal if the type hasn't moved in the module hierarchy between versions. A more coarse check would be to compare only the crate names instead of full paths, but that might lead to too many false positives.
    
    Additionally, I believe it would be helpful to show where the differing crates came from, i.e. the information in `rustc::middle::cstore::CrateSource`, but I'm not sure yet how to nicely display all of that, so I'm leaving it to a future PR.
    Mark-Simulacrum authored Jun 28, 2017
    Configuration menu
    Copy the full SHA
    a23660f View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#42831 - rthomas:master, r=QuietMisdreavus

    Update docs for fmt::write.
    
    rust-lang#29355
    
    I reworded it slightly to make it more clear that the function only take
    two arguments - the output and the Arguments struct that can be
    generated from the format_args! macro.
    
    r? @steveklabnik
    Mark-Simulacrum authored Jun 28, 2017
    Configuration menu
    Copy the full SHA
    211e09c View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#42832 - rthomas:doc-fmt, r=steveklabnik

    Update docs for std::fmt::format rust-lang#29355.
    
    This rewords and removes the `Arguments` section from the docs for
    fmt::format.
    
    r? @steveklabnik
    Mark-Simulacrum authored Jun 28, 2017
    Configuration menu
    Copy the full SHA
    a295c0b View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#42882 - stjepang:improve-sort-tests-and-ben…

    …ches, r=alexcrichton
    
    Improve tests and benchmarks for slice::sort and slice::sort_unstable
    
    This PR just hardens the tests and improves benchmarks.
    More specifically:
    
    1. Benchmarks don't generate vectors in `Bencher::iter` loops, but simply clone pregenerated vectors.
    2. Benchmark `*_strings` doesn't allocate Strings in `Bencher::iter` loops, but merely clones a `Vec<&str>`.
    3. Benchmarks use seeded `XorShiftRng` to be more consistent.
    4. Additional tests for `slice::sort` are added, which test sorting on slices with several ascending/descending runs. The implementation identifies such runs so it's a good idea to test that scenario a bit.
    5. More checks are added to `run-pass/vector-sort-panic-safe.rs`. Sort algorithms copy elements around a lot (merge sort uses an auxilliary buffer and pdqsort copies the pivot onto the stack before partitioning, then writes it back into the slice). If elements that are being sorted are internally mutable and comparison function mutates them, it is important to make sure that sort algorithms always use the latest "versions" of elements. New checks verify that this is true for both `slice::sort` and `slice::sort_unstable`.
    
    As a side note, all of those improvements were made as part of the parallel sorts PR in Rayon (nikomatsakis/rayon#379) and now I'm backporting them into libcore/libstd.
    
    r? @alexcrichton
    Mark-Simulacrum authored Jun 28, 2017
    Configuration menu
    Copy the full SHA
    28add4d View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#42901 - alexcrichton:alloc-one, r=sfackler

    std: Fix implementation of `Alloc::alloc_one`
    
    This had an accidental `u8 as *mut T` where it was intended to have just a
    normal pointer-to-pointer cast.
    
    Closes rust-lang#42827
    Mark-Simulacrum authored Jun 28, 2017
    Configuration menu
    Copy the full SHA
    0ee78c8 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#42925 - tbu-:pr_document_file_open_errors, …

    …r=GuillaumeGomez
    
    Document possible `io::ErrorKind`s of `fs::open`
    
    Try to make clear that this isn't an API guarantee for now, as we likely
    want to refine these errors in the future, e.g. `ENOSPC` "No space left
    on device".
    
    CC rust-lang#40322
    Mark-Simulacrum authored Jun 28, 2017
    Configuration menu
    Copy the full SHA
    9cd077a View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#42946 - AndiDog:patch-1, r=GuillaumeGomez

    compile-error.md: Fix link reference
    
    Was a copy-paste mistake, I guess
    Mark-Simulacrum authored Jun 28, 2017
    Configuration menu
    Copy the full SHA
    c583fa8 View commit details
    Browse the repository at this point in the history