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

Closed
wants to merge 12 commits into from
Closed

Rollup of 4 pull requests #39780

wants to merge 12 commits into from

Commits on Feb 11, 2017

  1. Add swap method for Cell

    Charlie Fan authored and F001 committed Feb 11, 2017
    Configuration menu
    Copy the full SHA
    a5e8bbf View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2017

  1. Add Solaris as recognized ostype

    Add cputype recognition for Solaris
    
    Fixes rust-lang#39729
    binarycrusader committed Feb 12, 2017
    Configuration menu
    Copy the full SHA
    ee54be3 View commit details
    Browse the repository at this point in the history
  2. fix copy pasta

    Don't need to catch WindowsError.  That was very silly of me.
    binarycrusader committed Feb 12, 2017
    Configuration menu
    Copy the full SHA
    33b655e View commit details
    Browse the repository at this point in the history
  3. fix exception handling for isainfo execution failure

    remove unnecessary gcc_s addition in libstd for Solaris
    binarycrusader committed Feb 12, 2017
    Configuration menu
    Copy the full SHA
    4a618fe View commit details
    Browse the repository at this point in the history
  4. Nuke src/vendor.

    eddyb committed Feb 12, 2017
    Configuration menu
    Copy the full SHA
    42c1ea2 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3807e1f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    aa44186 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2017

  1. Configuration menu
    Copy the full SHA
    9cf4972 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#39716 - F001:swapCell, r=alexcrichton

    Add `swap` method for `Cell`
    
    Addition to rust-lang#39264
    
    r? @alexcrichton
    frewsxcv committed Feb 13, 2017
    Configuration menu
    Copy the full SHA
    3b8a457 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#39728 - eddyb:vendeur-tres-bien, r=alexcric…

    …hton
    
    Automate vendoring by invoking cargo-vendor when building src dist tarballs.
    
    This avoids rust-lang#39633 bringing the `src/vendor` checked into git by rust-lang#37524, past 200,000 lines of code.
    
    I believe the strategy of having rustbuild run `cargo vendor` during the `dist src` step is sound.
    
    However, the only way to be sure `cargo-vendor` exists is to run `cargo install --force cargo-vendor`, which will recompile it every time (not passing `--force` means you can't tell between "already exists" and "build error"). ~~This is quite suboptimal and I'd like to somehow do it in each `Dockerfile` that would need it.~~
    
    * [ ] Cache `CARGO_HOME` (i.e. `~/.cargo`) between CI runs
      * `bin/cargo-vendor` and the actual caches are the relevant bits
    * [x] Do not build `cargo-vendor` all the time
      * ~~Maybe detect `~/.cargo/bin/cargo-vendor` already exists?~~
      * ~~Could also try to build it in a `Dockerfile` but do we have `cargo`/`rustc` there?~~
      * Final solution: check `cargo install --list` for a line starting with `cargo-vendor `
    
    cc @rust-lang/tools
    frewsxcv committed Feb 13, 2017
    Configuration menu
    Copy the full SHA
    02b29f2 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#39759 - binarycrusader:master, r=alexcrichton

    add solaris rustbuild support
    
    Add Solaris as recognized ostype
    Add cputype recognition for Solaris
    
    Fixes rust-lang#39729
    
    A future pull request will discriminate between the commercial release and older opensource derivatives to account for divergence, for now, this is compatible with both.
    frewsxcv committed Feb 13, 2017
    Configuration menu
    Copy the full SHA
    b7e57da View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#39778 - ahmedcharles:docs, r=frewsxcv

    Fix some typos in the core::fmt docs.
    frewsxcv committed Feb 13, 2017
    Configuration menu
    Copy the full SHA
    fd3e03b View commit details
    Browse the repository at this point in the history