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

Closed
wants to merge 11 commits into from
Closed

Commits on Sep 20, 2019

  1. libstd: Fix typos in doc

    rick68 committed Sep 20, 2019
    Configuration menu
    Copy the full SHA
    897d278 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2019

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

Commits on Oct 5, 2019

  1. Fix docs

    oxalica committed Oct 5, 2019
    Configuration menu
    Copy the full SHA
    3e69200 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2019

  1. Use cfg blocks and fix docs

    oxalica committed Oct 8, 2019
    Configuration menu
    Copy the full SHA
    79bc6d4 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2019

  1. Configuration menu
    Copy the full SHA
    21b4577 View commit details
    Browse the repository at this point in the history
  2. don't assume we can *always* find a return type hint in async fn

    In particular, we sometimes cannot if there is an earlier error.
    nikomatsakis committed Oct 9, 2019
    Configuration menu
    Copy the full SHA
    f7d0a8e View commit details
    Browse the repository at this point in the history
  3. make it possible to add args to cargo in x.py

    eg. make it easier to test -Ztimings for rustc
    andjo403 committed Oct 9, 2019
    Configuration menu
    Copy the full SHA
    6ae36a3 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#64337 - rick68:patch-17, r=Dylan-DPC

    libstd: Fix typos in doc
    Centril authored Oct 9, 2019
    Configuration menu
    Copy the full SHA
    15d183f View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#65094 - oxalica:linux-statx, r=alexcrichton

    Prefer statx on linux if available
    
    This PR make `metadata`-related functions try to invoke `statx` first on Linux if available,
    making `std::fs::Metadata::created` work on Linux with `statx` supported.
    
    It follows the discussion in rust-lang#61386 , and will fix rust-lang#59743
    
    The implementation of this PR is simply converting `struct statx` into `struct stat64` with
    extra fields for `btime` if `statx` succeeds, since other fields are not currently used.
    
    ---
    
    I also did a separated benchmark for `fs::metadata`, `stat64`, `statx`, and `statx` with conversion to `stat64`.
    It shows that `statx` with conversion is even more faster than pure `statx`.
    I think it's due to `sizeof stat64 == 114` but `sizeof statx == 256`.
    
    Anyway, the bare implementation of `statx` with conversion is only about 0.2% slower than the original impl (`stat64`-family).
    With heap-allocation counted (~8.5% of total cost), the difference between `stat` and `statx` (with or without conversion) is just nothing.
    
    Therefore, I think it is not urgent to use bare `struct statx` as underlying representation now.
    There is no need to break `std::os::linux::fs::MetadataExt::as_raw_stat` (rust-lang#61386 (comment))
    
    [Separated bare benchmarks](https://gist.github.com/oxalica/c4073ecb202c599fe41b7f15f86dc79c):
    ```
    metadata_ok             time:   [529.41 ns 529.77 ns 530.19 ns]
    metadata_err            time:   [538.71 ns 539.39 ns 540.35 ns]
    stat64_ok               time:   [484.32 ns 484.53 ns 484.75 ns]
    stat64_err              time:   [481.77 ns 482.00 ns 482.24 ns]
    statx_ok                time:   [488.07 ns 488.35 ns 488.62 ns]
    statx_err               time:   [487.74 ns 488.00 ns 488.27 ns]
    statx_cvt_ok            time:   [485.05 ns 485.28 ns 485.53 ns]
    statx_cvt_err           time:   [485.23 ns 485.45 ns 485.67 ns]
    ```
    
    r? @alexcrichton
    Centril authored Oct 9, 2019
    Configuration menu
    Copy the full SHA
    6846eb7 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#65129 - andjo403:cargo_args, r=alexcrichton

    make it possible to add args to cargo in x.py
    
    eg. make it easier to test -Ztimings for rustc
    
    cc rust-lang#65088
    Centril authored Oct 9, 2019
    Configuration menu
    Copy the full SHA
    8697fb3 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#65235 - nikomatsakis:issue-65159-async-fn-r…

    …eturn-ice, r=cramertj
    
    don't assume we can *always* find a return type hint in async fn
    
    In particular, we sometimes cannot if there is an earlier error.
    
    Fixes rust-lang#65159
    
    r? @cramertj, who reviewed the original PR
    Centril authored Oct 9, 2019
    Configuration menu
    Copy the full SHA
    5a24534 View commit details
    Browse the repository at this point in the history