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 6 pull requests #40911

Merged
merged 15 commits into from
Mar 30, 2017
Merged

Rollup of 6 pull requests #40911

merged 15 commits into from
Mar 30, 2017

Commits on Mar 25, 2017

  1. Clarify suggetion for field used as method

    Instead of
    
    ```
    error: no method named `src_addr` found for type `&wire::ipv4::Repr` in the current scope
       --> src/wire/ipv4.rs:409:34
        |
    409 |         packet.set_src_addr(self.src_addr());
        |                                  ^^^^^^^^
        |
    note: did you mean to write `self.src_addr`?
       --> src/wire/ipv4.rs:409:34
        |
    409 |         packet.set_src_addr(self.src_addr());
        |                                  ^^^^^^^^
    ```
    
    present
    
    ```
    error: no method named `src_addr` found for type `&wire::ipv4::Repr` in the current scope
       --> src/wire/ipv4.rs:409:34
        |
    409 |         packet.set_src_addr(self.src_addr());
        |                                  ^^^^^^^^ `src_addr` is a field, not a method
        |
        = help: did you mean to write `self.src_addr` instead of `self.src_addr(...)`?
    ```
    estebank committed Mar 25, 2017
    Configuration menu
    Copy the full SHA
    6341a8b View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2017

  1. libcore: sort_unstable: remove unnecessary loop.

    `other` is guaranteed to be less than `2 * len`.
    vadzimdambrouski committed Mar 28, 2017
    Configuration menu
    Copy the full SHA
    b909364 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1fea035 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d8fc5b8 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2017

  1. Attempt to cache git modules

    aidanhs committed Mar 29, 2017
    Configuration menu
    Copy the full SHA
    0347ff5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    872d3bc View commit details
    Browse the repository at this point in the history
  3. Minor tweaks to retry utility

    aidanhs committed Mar 29, 2017
    Configuration menu
    Copy the full SHA
    96e174f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4ef5542 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    19b98f3 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#40780 - aidanhs:aphs-cache-git-modules, r=a…

    …lexcrichton
    
    Attempt to cache git modules
    
    Partial resolution of rust-lang#40772, appveyor remains to be done once travis looks like it's working ok.
    
    The approach in this PR is based on the `--reference` flag to `git-clone`/`git-submodule --update` and is a compromise based on the current limitations of the tools we're using.
    
    The ideal would be:
    1. have a cached pristine copy of rust-lang/rust master in `$HOME/rustsrc` with all submodules initialised
    2. clone the PR branch with `git clone --recurse-submodules --reference $HOME/rustsrc [email protected]:rust-lang/rust.git`
    
    This would (in the nonexistent ideal world) use the pristine copy as an object cache for the top level repo and all submodules, transferring over the network only the changes on the branch. Unfortunately, a) there is no way to manually control the initial clone with travis and b) even if there was, cloned submodules don't use the submodules of the reference as an object cache. So the steps we end up with are:
    
    1. have a cached pristine copy of rust-lang/rust master in `$HOME/rustsrc` with all submodules initialised
    2. have a cloned PR branch
    3. extract the path of each submodule, and explicitly `git submodule update --init --reference $HOME/rustsrc/$module $module` (i.e. point directly to the location of the pristine submodule repo) for each one
    
    I've also taken some care to make this forward compatible, both for adding and removing submodules.
    
    r? @alexcrichton
    frewsxcv authored Mar 29, 2017
    Configuration menu
    Copy the full SHA
    a9dc8ac View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#40814 - abonander:issue_39436, r=jseyfried

    Rustdoc: memoize `pub use`-reexported macros so they don't appear twice in docs
    
    Closes rust-lang#39436
    
    Preserves existing behavior for `#[macro_reexport]`. `pub use`'d macros are shown as reexports unless inlined, and also correctly obey `#[doc(hidden)]`.
    
    r? @jseyfried
    
    cc @SergioBenitez
    frewsxcv authored Mar 29, 2017
    Configuration menu
    Copy the full SHA
    ea9c8b9 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#40816 - estebank:issue-38321, r=nikomatsakis

    Clarify suggetion for field used as method
    
    Instead of
    
    ```rust
    error: no method named `src_addr` found for type `&wire::ipv4::Repr` in the current scope
       --> src/wire/ipv4.rs:409:34
        |
    409 |         packet.set_src_addr(self.src_addr());
        |                                  ^^^^^^^^
        |
    note: did you mean to write `self.src_addr`?
       --> src/wire/ipv4.rs:409:34
        |
    409 |         packet.set_src_addr(self.src_addr());
        |                                  ^^^^^^^^
    ```
    
    present
    
    ```rust
    error: no method named `src_addr` found for type `&wire::ipv4::Repr` in the current scope
       --> src/wire/ipv4.rs:409:34
        |
    409 |         packet.set_src_addr(self.src_addr());
        |                                  ^^^^^^^^ field, not a method
        |
        = help: did you mean to write `self.src_addr` instead of `self.src_addr(...)`?
    ```
    
    Fix rust-lang#38321.
    frewsxcv authored Mar 29, 2017
    Configuration menu
    Copy the full SHA
    7f1083e View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#40832 - pftbest:fix_msp430, r=stjepang

    libcore: fix compilation on 16bit target (MSP430).
    
    Since PR rust-lang#40601 has been merged, libcore no longer compiles on MSP430.
    The reason is this code in `break_patterns`:
    ```rust
     let mut random = len;
     random ^= random << 13;
     random ^= random >> 17;
     random ^= random << 5;
     random &= modulus - 1;
    ```
    It assumes that `len` is at least a 32 bit integer.
    As a workaround replace `break_patterns` with an empty function for 16bit targets.
    
    cc @stjepang
    cc @alexcrichton
    frewsxcv authored Mar 29, 2017
    Configuration menu
    Copy the full SHA
    233e0f3 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#40901 - MaloJaffre:fix-double-redirect, r=s…

    …teveklabnik
    
    Avoid linking to a moved page in rust.html
    frewsxcv authored Mar 29, 2017
    Configuration menu
    Copy the full SHA
    be76eb4 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#40907 - donniebishop:utf8_unchecked_docs, r…

    …=steveklabnik
    
    Linked str in from_utf_unchecked
    
    References rust-lang#29375. Linked `str` in from_utf_unchecked's documentation to the docs for primitive `str`
    frewsxcv authored Mar 29, 2017
    Configuration menu
    Copy the full SHA
    fb6ced4 View commit details
    Browse the repository at this point in the history