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 12 pull requests #49302

Closed
wants to merge 49 commits into from
Closed

Rollup of 12 pull requests #49302

wants to merge 49 commits into from

Commits on Mar 15, 2018

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

Commits on Mar 16, 2018

  1. Add OnDrop

    Zoxc committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    683ad94 View commit details
    Browse the repository at this point in the history
  2. Replace Rc with Lrc

    Zoxc committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    3b43dcb View commit details
    Browse the repository at this point in the history
  3. Always print aborting due to n previous error(s) and only print it …

    …once for multi-threaded code
    Zoxc committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    910bf84 View commit details
    Browse the repository at this point in the history
  4. Update tests

    Zoxc committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    b1d872b View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2018

  1. Remove core::fmt::num::Decimal

    Before ebf9e1a, it was used for Display::fmt, but ebf9e1a replaced
    that with a faster implementation, and nothing else uses it.
    glandium committed Mar 17, 2018
    Configuration menu
    Copy the full SHA
    9e62681 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2018

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

Commits on Mar 19, 2018

  1. Address review comments

    ishitatsuyuki committed Mar 19, 2018
    Configuration menu
    Copy the full SHA
    a185b56 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c5c650d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    685c3c1 View commit details
    Browse the repository at this point in the history
  4. Stabilize termination_trait

    This stabilizes `main` with non-() return types; see rust-lang#48453.
    tmandry committed Mar 19, 2018
    Configuration menu
    Copy the full SHA
    97b3bf9 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e5a55e7 View commit details
    Browse the repository at this point in the history
  6. Document only-X test header

    sanxiyn committed Mar 19, 2018
    Configuration menu
    Copy the full SHA
    8236e43 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    f332a9c View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2018

  1. Configuration menu
    Copy the full SHA
    062a46f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    be29e52 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5ccf3ff View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8c8a72f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2928c7a View commit details
    Browse the repository at this point in the history
  6. Remove outdated comment

    oli-obk committed Mar 20, 2018
    Configuration menu
    Copy the full SHA
    df76629 View commit details
    Browse the repository at this point in the history
  7. rename epoch to edition

    klnusbaum committed Mar 20, 2018
    Configuration menu
    Copy the full SHA
    3c8d555 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    11f1406 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    72334fe View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2018

  1. Revert "Stabilize termination_trait in 1.25, not 1.26"

    This reverts commit e5a55e7.
    tmandry committed Mar 21, 2018
    Configuration menu
    Copy the full SHA
    1937661 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    94bdeb6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2cdc7af View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b6934c9 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    178652a View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    1392179 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2018

  1. Configuration menu
    Copy the full SHA
    2b13d95 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b48a26c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    25c5b03 View commit details
    Browse the repository at this point in the history
  4. Use GNU version of fgrep/egrep tool if available

    It is mostly for BSD system. Some tests (run-make/issue-35164 and
    run-make/cat-and-grep-sanity-check) are failing with BSD
    fgrep, whereas they pass with gnu version (gfgrep).
    semarie committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    de1c929 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    347b9d6 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    1b0e9f5 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    73fa6d5 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2018

  1. Rollup merge of rust-lang#48575 - ishitatsuyuki:unix-no-thread, r=ale…

    …xcrichton
    
    rustc_driver: get rid of the extra thread
    
    We can alter the stack size afterwards on Unix.
    
    Having a separate thread causes poor debugging experience when interrupting with signals. I have to get the backtrace of the all thread, as the main thread is waiting to join doing nothing else. This patch allows me to just run `bt` to get the desired backtrace.
    frewsxcv authored Mar 23, 2018
    Configuration menu
    Copy the full SHA
    f78405d View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#49035 - klnusbaum:49001_epoch, r=Manishearth

    rename epoch to edition
    
    As outlined in rust-lang#49001 we'd like to rename all instances of `epoch` to `edition`. I developed the following bash script to assist in the rename. It renames all instances of `epoch` to `edition` and `Epoch` to `Edition` in all of the files I was able to determine were relevant. It then renames a few relevant files that had `epoch` in there name and finally prints out all of the remaining instance of the strings `epoch` and `Epoch` (which, as far as I can tell should not be changed). Here is the script:
    
    ```
    replace() {
    	sed -i '' "s/epoch/edition/g" "$1"
        sed -i '' "s/Epoch/Edition/g" "$1"
    }
    
    replace "src/librustc/lint/context.rs"
    replace "src/librustc/lint/mod.rs"
    replace "src/librustc/session/config.rs"
    replace "src/librustc/session/mod.rs"
    replace "src/librustc_driver/driver.rs"
    replace "src/librustc_lint/lib.rs"
    replace "src/librustc_typeck/check/method/probe.rs"
    replace "src/libsyntax/config.rs"
    replace "src/libsyntax/epoch.rs"
    replace "src/libsyntax/feature_gate.rs"
    replace "src/libsyntax/lib.rs"
    replace "src/test/compile-fail/epoch-raw-pointer-method-2015.rs"
    replace "src/test/compile-fail/epoch-raw-pointer-method-2018.rs"
    replace "src/test/run-pass/dyn-trait.rs"
    replace "src/test/run-pass/epoch-gate-feature.rs"
    replace "src/test/ui/inference-variable-behind-raw-pointer.stderr"
    
    git mv src/libsyntax/epoch.rs src/libsyntax/edition.rs
    git mv src/test/compile-fail/epoch-raw-pointer-method-2015.rs src/test/compile-fail/edition-raw-pointer-method-2015.rs
    git mv src/test/compile-fail/epoch-raw-pointer-method-2018.rs src/test/compile-fail/edition-raw-pointer-method-2018.rs
    
    git grep "epoch" ./*
    git grep "Epoch" ./*
    ```
    And here is the output of the script:
    ```
    kurtis-rust$ ./epoch_to_edition.sh
    src/Cargo.lock: "crossbeam-epoch 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
    src/Cargo.lock:name = "crossbeam-epoch"
    src/Cargo.lock:"checksum crossbeam-epoch 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "59796cc6cbbdc6bb319161349db0c3250ec73ec7fcb763a51065ec4e2e158552"
    src/ci/docker/scripts/android-start-emulator.sh:# Using the default qemu2 engine makes time::tests::since_epoch fails because
    src/ci/docker/scripts/android-start-emulator.sh:# the emulator date is set to unix epoch (in armeabi-v7a-18 image). Using
    src/librustc_incremental/persist/fs.rs:    let micros_since_unix_epoch = u64::from_str_radix(s, INT_ENCODE_BASE as u32);
    src/librustc_incremental/persist/fs.rs:    if micros_since_unix_epoch.is_err() {
    src/librustc_incremental/persist/fs.rs:    let micros_since_unix_epoch = micros_since_unix_epoch.unwrap();
    src/librustc_incremental/persist/fs.rs:    let duration = Duration::new(micros_since_unix_epoch / 1_000_000,
    src/librustc_incremental/persist/fs.rs:                                 1000 * (micros_since_unix_epoch % 1_000_000) as u32);
    src/libstd/sys/cloudabi/abi/cloudabi.rs:  /// The epoch of this clock is undefined. The absolute
    src/libstd/time.rs:        let one_second_from_epoch = UNIX_EPOCH + Duration::new(1, 0);
    src/libstd/time.rs:        let one_second_from_epoch2 = UNIX_EPOCH + Duration::new(0, 500_000_000)
    src/libstd/time.rs:        assert_eq!(one_second_from_epoch, one_second_from_epoch2);
    src/libstd/time.rs:    fn since_epoch() {
    src/test/run-pass/issue-29540.rs:    pub mon_min_osdmap_epochs: String,
    src/test/run-pass/issue-29540.rs:    pub mon_max_pgmap_epochs: String,
    src/test/run-pass/issue-29540.rs:    pub mon_max_log_epochs: String,
    src/test/run-pass/issue-29540.rs:    pub mon_max_mdsmap_epochs: String,
    src/test/run-pass/issue-29540.rs:    pub osd_map_share_max_epochs: String,
    src/test/run-pass/issue-29540.rs:    pub osd_pg_epoch_persisted_max_stale: String,
    ```
    
    If it looks like I've missed any things that should be converted, please let me know. There were also some notes in `src/libsyntax/epoch.rs` that indicated there might be some necessary/parallel changes that need to made in cargo. But we should probably make a separate issue for that.
    frewsxcv authored Mar 23, 2018
    Configuration menu
    Copy the full SHA
    8b41a59 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#49046 - Zoxc:error-summary, r=michaelwoerister

    Always print `aborting due to n previous error(s)`
    
    r? @michaelwoerister
    frewsxcv authored Mar 23, 2018
    Configuration menu
    Copy the full SHA
    0616e86 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#49064 - QuietMisdreavus:piercing-the-veil, …

    …r=GuillaumeGomez
    
    rustdoctest: suppress the default allow(unused) under --display-warnings
    
    If you're passing rustdoc `--display-warnings`, you probably want to see the default ones too. This change modifies `test::make_test` to suppress the default `#![allow(unused)]` if the `--display-warnings` CLI flag was provided to rustdoc.
    
    cc rust-lang#41574
    frewsxcv authored Mar 23, 2018
    Configuration menu
    Copy the full SHA
    db65b0c View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#49102 - glandium:decimal, r=aturon

    Remove core::fmt::num::Decimal
    
    Before ebf9e1a, it was used for Display::fmt, but ebf9e1a replaced
    that with a faster implementation, and nothing else uses it.
    frewsxcv authored Mar 23, 2018
    Configuration menu
    Copy the full SHA
    a662d20 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#49160 - estebank:issue-47457-missing-fields…

    …, r=oli-obk
    
    Reduce the diagnostic spam when multiple fields are missing in pattern
    
    Fix rust-lang#47457.
    frewsxcv authored Mar 23, 2018
    Configuration menu
    Copy the full SHA
    c783019 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#49162 - tmandry:stabilize-termination-trait…

    …, r=nikomatsakis
    
    Stabilize termination_trait, split out termination_trait_test
    
    For rust-lang#48453.
    
    First time contribution, so I'd really appreciate any feedback on how this PR can be better.
    
    Not sure exactly what kind of documentation update is needed. If there is no PR to update the reference, I can try doing that this week as I have time.
    frewsxcv authored Mar 23, 2018
    Configuration menu
    Copy the full SHA
    dcf27e9 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#49169 - sanxiyn:doc-only, r=aturon

    Document only-X test header
    
    This was added in rust-lang#47487 without documentation.
    frewsxcv authored Mar 23, 2018
    Configuration menu
    Copy the full SHA
    6f29269 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#49193 - davidtwco:issue-29893, r=alexcrichton

    Host compiler documentation
    
    Fixes rust-lang#29893. Rust Central Station PR: rust-lang/rust-central-station#40
    
    r? @alexcrichton
    frewsxcv authored Mar 23, 2018
    Configuration menu
    Copy the full SHA
    1247bef View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#49262 - oli-obk:fixed_size_array_len, r=est…

    …ebank
    
    Produce nice array lengths on a best effort basis
    
    fixes rust-lang#49208
    
    r? @estebank
    frewsxcv authored Mar 23, 2018
    Configuration menu
    Copy the full SHA
    759ebda View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#49268 - ordovicia:dotdot-pattern-diag, r=pe…

    …trochenkov
    
    Better diagnostics for '..' pattern fragment not in the last position
    
    Fixes rust-lang#49257.
    frewsxcv authored Mar 23, 2018
    Configuration menu
    Copy the full SHA
    9e0d0ff View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#49272 - semarie:cat-and-grep-gnu, r=alexcri…

    …chton
    
    Use GNU version of fgrep/egrep tool if available
    
    It is mostly for BSD system. Some tests (run-make/issue-35164 and
    run-make/cat-and-grep-sanity-check) are failing with BSD
    fgrep, whereas they pass with gnu version (gfgrep).
    frewsxcv authored Mar 23, 2018
    Configuration menu
    Copy the full SHA
    cb1ffc7 View commit details
    Browse the repository at this point in the history