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 11 pull requests #43316

Merged
merged 22 commits into from
Jul 19, 2017
Merged

Rollup of 11 pull requests #43316

merged 22 commits into from
Jul 19, 2017

Commits on Jul 13, 2017

  1. Update docs on Error struct. rust-lang#29355

    This adds a pretty contrived example of the usage of fmt::Error. I am
    very open to suggestions for a better one.
    
    I have also highlighted the fmt::Error vs std::error::Error.
    
    r? @steveklabnik
    rthomas committed Jul 13, 2017
    Configuration menu
    Copy the full SHA
    aca6cd0 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2017

  1. Update merge queue link

    feadoor authored Jul 17, 2017
    Configuration menu
    Copy the full SHA
    c329311 View commit details
    Browse the repository at this point in the history
  2. libstd: remove redundant & from &Path::new(...)

    fn Path::new<S: AsRef ...>(s: &S) -> &Path
    
    Signed-off-by: NODA, Kai <[email protected]>
    nodakai committed Jul 17, 2017
    Configuration menu
    Copy the full SHA
    2e8859c View commit details
    Browse the repository at this point in the history
  3. Fix "Quasi-quoting is inefficient" warning in incremental rustbuild.

    After rust-lang#43252 is merged, building stage0 libcore with -i (--incremental)
    flag will cause 17 "Quasi-quoting might make incremental compilation very
    inefficient: NtExpr(..)" warnings, as in rust-lang#40946.
    
    Fixing the warning in rust-lang#40946 will take 12 weeks from now to make into the
    next stage0, so it is quicker to workaround it in libcore instead.
    kennytm committed Jul 17, 2017
    Configuration menu
    Copy the full SHA
    2d6c10f View commit details
    Browse the repository at this point in the history
  4. std::time::Duration: improve _precision_ of terminology in docs

    Changed wording of docs on `std::time::Duration` for better clarity
    w.r.t. the contents of the type and the purpose of its methods.
    insaneinside committed Jul 17, 2017
    Configuration menu
    Copy the full SHA
    1ac98ae View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2017

  1. Configuration menu
    Copy the full SHA
    6f80cd7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ffefc9a View commit details
    Browse the repository at this point in the history
  3. Change Travis CI job order.

    Reorder the job matrix to take advantage of the order how Travis CI starts
    them in rust-lang/rust. Plus other refactoring of `.travis.yml`.
    
    1. Move the `$ALLOW_PR` image to the top, so users' PRs will start testing
       immediately. Previously the `$ALLOW_PR` image starts 6 minutes after the
       build was scheduled.
    
    2. Move the slow macOS images near the top, so they share more time with
       the rest of the faster Linux builds, which should shorten total test
       time (actually not much, about 7 minutes at most if this change does
       work).
    
    3. Merged the `install` section of both Linux and macOS to make the `env:`
       section a bit shorter, and enable change 4 below.
    
    4. Do not download or install anything if `$SKIP_BUILD == true`, which
       further reduces chance of spurious failure in the PR-CI stage (avoid the
       red cross appearing even if CI passed).
    kennytm committed Jul 18, 2017
    Configuration menu
    Copy the full SHA
    a7eb87e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e185c6c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    de7decc View commit details
    Browse the repository at this point in the history
  6. travis: Switch curl -s to curl -f

    I seem to have been a little too tired when I fixed up the container scripts,
    applying the wrong flag!
    alexcrichton committed Jul 18, 2017
    Configuration menu
    Copy the full SHA
    8340f74 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#42837 - rthomas:29355-error, r=steveklabnik

    Update docs on Error struct. rust-lang#29355
    
    This adds a pretty contrived example of the usage of fmt::Error. I am
    very open to suggestions for a better one.
    
    I have also highlighted the fmt::Error vs std::error::Error.
    
    r? @steveklabnik
    Mark-Simulacrum authored Jul 18, 2017
    Configuration menu
    Copy the full SHA
    b83285b View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#43282 - feadoor:patch-1, r=nikomatsakis

    Update merge queue link in CONTRIBUTING.md
    Mark-Simulacrum authored Jul 18, 2017
    Configuration menu
    Copy the full SHA
    413ef50 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#43287 - kennytm:travis-ci-adjustments, r=al…

    …excrichton
    
    Change Travis CI job order.
    
    Reorder the job matrix to take advantage of the order how Travis CI starts them in rust-lang/rust. Plus other refactoring of `.travis.yml`.
    
    1. Move the `$ALLOW_PR` image to the top, so pull requests will start testing as immediately after the build is started. Previously the `$ALLOW_PR` image starts 6 minutes after the build was scheduled.
    
    2. Move the slow macOS images near the top, so they share more time with the rest of the faster Linux builds, which should shorten total test time (actually not much, about 7 minutes at most if this change does work).
    
    3. Merged the `install` section of both Linux and macOS to make the `env:` section a bit shorter, and enable change 4 below.
    
    4. Do not download or install anything if `$SKIP_BUILD == true`, which further reduces chance of spurious failure in the PR-CI stage (avoid the red cross appearing even if CI passed).
    
    (IMO `$SKIP_BUILD` should not even exist: those irrelevant jobs should not start at all, but that would require travis-ci/travis-ci#2778 which has been rejected)
    Mark-Simulacrum authored Jul 18, 2017
    Configuration menu
    Copy the full SHA
    6a56671 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#43290 - nodakai:fix-ref-path-new, r=Mark-Si…

    …mulacrum
    
    libstd: remove redundant & from &Path::new(...)
    
    ```rust
    fn Path::new<S: AsRef ...>(s: &S) -> &Path
    ```
    
    * https://doc.rust-lang.org/std/path/struct.Path.html#method.new
    Mark-Simulacrum authored Jul 18, 2017
    Configuration menu
    Copy the full SHA
    751c6e2 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#43292 - kennytm:fix-quasi-quoting-warning-i…

    …n-rustbuild, r=alexcrichton
    
    Workaround "Quasi-quoting is inefficient" warning in incremental rustbuild introduced in rust-lang#43252.
    
    After rust-lang#43252 is merged, building stage0 libcore with `-i` (`--incremental`) flag will cause 17 "Quasi-quoting might make incremental compilation very inefficient: NtExpr(..)" warnings, as in rust-lang#40946.
    
    ```
    warning: Quasi-quoting might make incremental compilation very inefficient: NtExpr(..)
       --> src/libcore/default.rs:133:21
        |
    133 |             #[doc = $doc]
        |                     ^^^^
    ...
    139 | default_impl! { (), (), "Returns the default value of `()`" }
        | ------------------------------------------------------------- in this macro invocation
    (× 17)
    ```
    
    True fix for rust-lang#40946 will take at least 12 weeks from now to make into the next stage0, so it is quicker to workaround it in libcore instead.
    
    cc @vbrandl @jseyfried
    Mark-Simulacrum authored Jul 18, 2017
    Configuration menu
    Copy the full SHA
    ac9e9e5 View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#43294 - insaneinside:std-time-duration-docs…

    …, r=aturon
    
    `std::time::Duration`: improve _precision_ of terminology in docs
    
    Changed wording of docs on `std::time::Duration` for better clarity w.r.t. the contents of the type and the purpose of its methods.  (Specifically, removed the use of the word "precision" to describe the fractional part of the `Duration` because "precision" is more properly used to describe how _precise_ a value is, i.e. its granularity in this case.)
    Mark-Simulacrum authored Jul 18, 2017
    Configuration menu
    Copy the full SHA
    f568249 View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#43304 - ids1024:path2, r=aturon

    redox: handle multiple paths in PATH
    Mark-Simulacrum authored Jul 18, 2017
    Configuration menu
    Copy the full SHA
    b43f58b View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#43310 - lynn:rc-weak-doc-fix, r=apasel422

    Fix erroneous reference to Arc instead of Rc in rc::Weak documentation
    
    The docs for `rc::Weak` refer to `Arc` in one place, where they should obviously be referring to `Rc`; presumably this was erroneously copied over from the `arc::Weak` docs.
    Mark-Simulacrum authored Jul 18, 2017
    Configuration menu
    Copy the full SHA
    0d004c5 View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#43312 - lu-zero:master, r=alexcrichton

    powerpc: Ignore the stack-probes test
    
    One little step further to have the test working fine on power8 :)
    Mark-Simulacrum authored Jul 18, 2017
    Configuration menu
    Copy the full SHA
    fc7f0fd View commit details
    Browse the repository at this point in the history
  16. Rollup merge of rust-lang#43314 - alexcrichton:fail-curl, r=aidanhs

    travis: Switch `curl -s` to `curl -f`
    
    I seem to have been a little too tired when I fixed up the container scripts,
    applying the wrong flag!
    Mark-Simulacrum authored Jul 18, 2017
    Configuration menu
    Copy the full SHA
    21a7b26 View commit details
    Browse the repository at this point in the history
  17. Rollup merge of rust-lang#43315 - est31:stabilize_float_bits_conv, r=…

    …alexcrichton
    
    float_bits_conv made it into 1.20
    
    It seems that my PR to stabilize the `float_bits_conv` feature got merged before beta branched, which means I'm lucky, and the stabilization makes it into Rust 1.20. As it was against my expectations, the version number has to be corrected from 1.21 to 1.20.
    
    Please also apply this PR to the beta branch.
    Mark-Simulacrum authored Jul 18, 2017
    Configuration menu
    Copy the full SHA
    dc6606e View commit details
    Browse the repository at this point in the history