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 24 pull requests #47392

Merged
merged 55 commits into from
Jan 12, 2018
Merged

Rollup of 24 pull requests #47392

merged 55 commits into from
Jan 12, 2018

Commits on Dec 28, 2017

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

Commits on Dec 29, 2017

  1. rustfmt libarena/lib.rs

    Kagamihime committed Dec 29, 2017
    Configuration menu
    Copy the full SHA
    bafbac4 View commit details
    Browse the repository at this point in the history
  2. fixup

    Kagamihime committed Dec 29, 2017
    Configuration menu
    Copy the full SHA
    b2d0d18 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2017

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

Commits on Jan 4, 2018

  1. Clean output

    ritiek committed Jan 4, 2018
    Configuration menu
    Copy the full SHA
    45c2c9a View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2018

  1. Show line numbers

    ritiek committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    4054030 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2018

  1. Update musl to 1.1.18

    According to http://www.musl-libc.org/download.html:
    
    This release corrects regressions in glob() and armv4t build failure
    introduced in the previous release, and includes an important bug fix
    for posix_spawnp in the presence of a large PATH environment variable.
    malbarbo committed Jan 8, 2018
    Configuration menu
    Copy the full SHA
    b5a3f56 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2018

  1. Update jobserver to 0.1.9

    Fix for `ENOSYS` when calling `pipe2`, rust-lang/jobserver-rs#5.
    
    r? @alexcrichton
    cuviper committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    b1c9b6e View commit details
    Browse the repository at this point in the history
  2. Skip linker-output-non-utf8 test on Apple

    This test fails on APFS filesystems with the following error:
    
    mkdir: /Users/ryan/Code/rust/build/x86_64-apple-darwin/test/run-make/linker-output-non-utf8.stage2-x86_64-apple-darwin/zzz�: Illegal byte sequence
    
    This is due to APFS now requiring that all paths are valid UTF-8. As
    APFS will be the default filesystem for all new Darwin-based systems the
    most straightforward fix is to skip this test on Darwin as well as
    Windows.
    etaoins committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    a713c67 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7b420cf View commit details
    Browse the repository at this point in the history
  4. Restore the original Window comment

    The Windows situation is more complicated than I realised
    etaoins committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    4cc0fe5 View commit details
    Browse the repository at this point in the history
  5. Fix typo

    etaoins committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    b69c320 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2018

  1. Configuration menu
    Copy the full SHA
    ce4673d View commit details
    Browse the repository at this point in the history
  2. fix typo rwlock.rs

    Hi. Fixed typo: contained -> content
    bmusin authored Jan 10, 2018
    Configuration menu
    Copy the full SHA
    d0d5db6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fe21c4c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    44912bf View commit details
    Browse the repository at this point in the history
  5. Fix panic strings.

     - Fix panic string in `check_ast_crate`.
    dlrobertson committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    c78679d View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3f9c057 View commit details
    Browse the repository at this point in the history
  7. Fix typo.

    Alexis Hunt committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    9d9504a View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2018

  1. Glued tokens can themselves be joint.

    When gluing two tokens, the second of which is joint, the result should also be
    joint.
    This fixes an issue with joining three `Dot` tokens to make a `DotDotDot` - the
    intermediate `DotDot` would not be joint and therefore we would not attempt to
    glue the last `Dot` token, yielding `.. .` instead of `...`.
    goffrie committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    2e0ad5a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9649c4a View commit details
    Browse the repository at this point in the history
  3. Make libtest build on CloudABI.

    Just like on UNIX systems, we need to use sysconf() to obtain the number
    of CPUs. Extend the existing cfg()'s to match CloudABI as well.
    EdSchouten committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    9babb8a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    fc825f0 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    bac725e View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    882cd3c View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    e2c1a93 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    8002876 View commit details
    Browse the repository at this point in the history
  9. Enable num tests on wasm

    Diggsey committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    53c05ff View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2018

  1. Configuration menu
    Copy the full SHA
    7cad7f6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    142134d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    42410a9 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#46985 - Diggsey:path-component-asref, r=ale…

    …xcrichton
    
    Implement AsRef<Path> for Component
    
    Fixes rust-lang#41866
    kennytm authored Jan 12, 2018
    Configuration menu
    Copy the full SHA
    743b976 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#47069 - Kagamihime:master, r=nrc

    rustfmt libarena/lib.rs
    
    Note: it's my very first pull request. I'm trying to do something very simple to see how it works here, even if it's a tiny change or maybe it's not correct (sorry if it is the case).
    
    r? @nrc
    kennytm authored Jan 12, 2018
    Configuration menu
    Copy the full SHA
    30a3516 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#47081 - pietroalbini:fix-nested-tree-dump, …

    …r=nrc
    
    Fix nested imports not included in the save_analysis output
    
    This PR fixes rust-lang#46823.
    
    The bug was caused by the old access level checking code, which checked against the root UseTree even for nested trees. The problem with that is, for nested trees the root is lowered as an empty `ListStem`, which is not reachable by definition. The new code computes the access level with each tree's own ID, and with the root tree's visibility.
    
    I tested this manually and it works, but I'm not really satisfied with that. I looked at the existing tests though, and no one checked for the save_analysis output as far as I can see. How should I proceed with that? I think having a test about this would be really nice.
    kennytm authored Jan 12, 2018
    Configuration menu
    Copy the full SHA
    b35cb1e View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#47185 - ritiek:ui-test-failed-output, r=nik…

    …omatsakis
    
    Show only stderr diff when a ui test fails
    
    Addresses rust-lang#46826.
    
    This PR will print the normalized output if expected text is empty otherwise it will just print the diff.
    
    Should we also show a few (actual == expected) lines above & below when displaying the diff? What about indicating line numbers as well so one can quickly check mismatch lines in .stderr file?
    kennytm authored Jan 12, 2018
    Configuration menu
    Copy the full SHA
    6ac0888 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#47282 - malbarbo:i586-musl, r=alexcrichton

    Add i586-unknown-linux-musl target
    kennytm authored Jan 12, 2018
    Configuration menu
    Copy the full SHA
    f30f18f View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#47283 - malbarbo:musl-1.1.18, r=alexcrichton

    Update musl to 1.1.18
    
    According to http://www.musl-libc.org/download.html:
    
    This release corrects regressions in glob() and armv4t build failure
    introduced in the previous release, and includes an important bug fix
    for posix_spawnp in the presence of a large PATH environment variable.
    kennytm authored Jan 12, 2018
    Configuration menu
    Copy the full SHA
    0d199d5 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#47288 - cuviper:jobserver-pipe2, r=alexcric…

    …hton
    
    Update jobserver to 0.1.9
    
    Fix for `ENOSYS` when calling `pipe2`, rust-lang/jobserver-rs#5.
    
    r? @alexcrichton
    kennytm authored Jan 12, 2018
    Configuration menu
    Copy the full SHA
    1233602 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#47289 - etaoins:skip-linker-output-non-utf8…

    …-test-on-apple, r=kennytm
    
    Skip linker-output-non-utf8 test on Apple
    
    This test fails on APFS filesystems with the following error:
    
    ```shell
    mkdir: /Users/ryan/Code/rust/build/x86_64-apple-darwin/test/run-make/linker-output-non-utf8.stage2-x86_64-apple-darwin/zzz�: Illegal byte sequence
    ```
    
    The mkdir does succeed on an HFS+ volume mounted on the same system:
    ```shell
    $ mkdir zzz$$'\xff'
    $ ls
    zzz47432\xff
    ```
    
    This is due to APFS now requiring that all paths are valid UTF-8. As APFS will be the default filesystem for all new Darwin-based systems the most straightforward fix is to skip this test on Darwin as well as Windows.
    kennytm authored Jan 12, 2018
    Configuration menu
    Copy the full SHA
    8aab0cc View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#47298 - cramertj:path-as-modrs, r=nikomatsakis

    Treat #[path] files as mod.rs files
    
    Fixes rust-lang#46936, cc @briansmith, @SergioBenitez, @nikomatsakis.
    
    This (insta-stable) change treats files included via `#[path = "bla.rs"] mod foo;` as though they were `mod.rs` files. Namely, it allows them to include `mod` statements and looks for the child modules in sibling directories, rather than in relative `modname/childmodule.rs` files as happens for non-`mod.rs` files.
    
    This change makes the `non_modrs_mods` feature backwards compatible with the existing usage in https://github.com/briansmith/ring, several versions of which are currently broken in beta. If we decide to merge, this change should be backported to beta.
    
    cc rust-lang#37872
    
    r? @jseyfried
    kennytm authored Jan 12, 2018
    Configuration menu
    Copy the full SHA
    e40a6fb View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#47305 - cramertj:better-calendar-alone, r=e…

    …ddyb
    
    Use copy/clone closures to simplify calendar test
    
    Split out from rust-lang#47304
    
    r? @eddyb
    kennytm authored Jan 12, 2018
    Configuration menu
    Copy the full SHA
    f4ff4c0 View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#47306 - alexreg:dataflow-analysis, r=eddyb

    Don't track local_needs_drop separately in qualify_consts.
    
    None
    kennytm authored Jan 12, 2018
    Configuration menu
    Copy the full SHA
    df8f2c6 View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#47307 - dlrobertson:fix_panic_strings, r=ke…

    …nnytm
    
    Fix panic strings.
    
     - Fix panic string in `check_ast_crate`.
     - Update panic string for Duration subtraction on overflow/underflow.
    
    Not sure if the changes to `Duration` are helpful/needed. Mostly just a nit.
    Otherwise this is just a one character change :)
    
    On another note: I hit the panic in `check_ast_crate` when compiling
    [m-labs/smoltcp] with the following:
    
    ```
    cargo test --doc --no-default-features --features "std socket-raw"`
    ```
    
    [m-labs/smoltcp]: https://github.com/m-labs/smoltcp
    kennytm authored Jan 12, 2018
    Configuration menu
    Copy the full SHA
    9bedbcc View commit details
    Browse the repository at this point in the history
  16. Rollup merge of rust-lang#47310 - bmusin:patch-1, r=sfackler

    fix typo rwlock.rs
    
    Hi. Fixed typo: contained -> content
    kennytm authored Jan 12, 2018
    Configuration menu
    Copy the full SHA
    426036b View commit details
    Browse the repository at this point in the history
  17. Rollup merge of rust-lang#47324 - mbrubeck:len, r=sfackler

    Pre-allocate in fs::read and fs::read_string
    
    This is a simpler alternative to rust-lang#46340 and rust-lang#45928, as requested by the libs team.
    kennytm authored Jan 12, 2018
    Configuration menu
    Copy the full SHA
    52770e6 View commit details
    Browse the repository at this point in the history
  18. Rollup merge of rust-lang#47328 - mbrubeck:fs_read, r=sfackler

    Use the new fs_read_write functions in rustc internals
    
    Uses `fs::read` and `fs::write` (added by rust-lang#45837) where appropriate, to simplify code and dog-food these new APIs.  This also improves performance, when combined with rust-lang#47324.
    kennytm authored Jan 12, 2018
    Configuration menu
    Copy the full SHA
    7ffdabd View commit details
    Browse the repository at this point in the history
  19. Rollup merge of rust-lang#47331 - michaelwoerister:measure-depgraph-l…

    …oading, r=alexcrichton
    
    Add -Ztime-passes line for dep-graph loading.
    
    We measure how much time the background thread spends on loading the dep-graph but not how long the main thread is blocked while the background thread is still working. Let's change that!
    kennytm authored Jan 12, 2018
    Configuration menu
    Copy the full SHA
    30dbbb5 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    cf70a48 View commit details
    Browse the repository at this point in the history
  21. Rollup merge of rust-lang#47343 - goffrie:master, r=jseyfried

    Glued tokens can themselves be joint.
    
    When gluing two tokens, the second of which is joint, the result should also be
    joint.
    This fixes an issue with joining three `Dot` tokens to make a `DotDotDot` - the
    intermediate `DotDot` would not be joint and therefore we would not attempt to
    glue the last `Dot` token, yielding `.. .` instead of `...`.
    
    r? @jseyfried
    kennytm committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    b480366 View commit details
    Browse the repository at this point in the history
  22. Rollup merge of rust-lang#47344 - topecongiro:fixed-ices, r=alexcrichton

    Add tests to fixed issues.
    
    Closes rust-lang#36792. Closes rust-lang#38091. Closes rust-lang#39687. Closes rust-lang#42148. Closes rust-lang#42956.
    kennytm committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    f589482 View commit details
    Browse the repository at this point in the history
  23. Rollup merge of rust-lang#47352 - EdSchouten:cloudabi-libtest, r=kennytm

    Make libtest build on CloudABI.
    
    Just like on UNIX systems, we need to use sysconf() to obtain the number
    of CPUs. Extend the existing cfg()'s to match CloudABI as well.
    kennytm committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    a63121c View commit details
    Browse the repository at this point in the history
  24. Rollup merge of rust-lang#47357 - whentze:osstr-doc-fix, r=GuillaumeG…

    …omez
    
    Fix docs for OsStr
    
    At present, there are two small issues with the [docs](https://doc.rust-lang.org/std/ffi/struct.OsStr.html) for std::ffi::OsStr:
    - The docs say "OsStr is to OsString as String is to &str: the former in each pair are borrowed references; the latter are owned strings.". The latter pair is mixed up: String is the owned variant whereas &str is the borrowed reference.
    - The doc links to String and &str are broken and render as [String] and [&str].
    
    This PR fixes these issues.
    kennytm committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    db36d18 View commit details
    Browse the repository at this point in the history
  25. Rollup merge of rust-lang#47365 - Diggsey:issue-42630, r=alexcrichton

    Re-enable num tests on wasm
    
    Issue rust-lang#42630 was closed but the tests are still ignored, supposedly they should pass now.
    kennytm committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    722838f View commit details
    Browse the repository at this point in the history
  26. Rollup merge of rust-lang#47375 - overvenus:duration-examples, r=dtolnay

    Fix examples of Duration::subsec_millis and Duration::subsec_micros
    
    Update examples of `Duration::subsec_millis` and `Duration::subsec_micros`, because they are not for these two methods actually.
    kennytm committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    21ac84e View commit details
    Browse the repository at this point in the history
  27. Rollup merge of rust-lang#47382 - topecongiro:issue-43105, r=eddyb

    Ignore CTFE errors while lowering patterns
    
    Closes rust-lang#43105.
    
    r? @eddyb
    kennytm committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    c12eabf View commit details
    Browse the repository at this point in the history