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 5 pull requests #40758

Merged
merged 15 commits into from
Mar 23, 2017
Merged

Rollup of 5 pull requests #40758

merged 15 commits into from
Mar 23, 2017

Commits on Mar 20, 2017

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

Commits on Mar 21, 2017

  1. Configuration menu
    Copy the full SHA
    8e58d9e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1f65610 View commit details
    Browse the repository at this point in the history
  3. Switch to rust-lang-ci mirror URLs

    alexcrichton authored and TimNN committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    7ae7bf3 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ba90248 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    43a51b7 View commit details
    Browse the repository at this point in the history
  6. Fix doc error for ExactSizeIterator

    The code example in the trait documentation of ExactSizeIterator
    has an incorrect implementation of the len method that does not return
    the number of times the example iterator 'Counter' will iterate. This
    may confuse readers of the docs as the example code will compile but 
    doesn't uphold the trait's contract.
    
    This is easily fixed by modifying the implementation of len and changing
    the assert statement to actually assert the correct behaviour. I also
    slightly modified a code comment to better reflect what the method 
    returns.
    manuel-rhdt committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    a8800bb View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2017

  1. Configuration menu
    Copy the full SHA
    85dbc65 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7d302d2 View commit details
    Browse the repository at this point in the history
  3. Add diagnostic for incorrect pub (restriction)

    Given the following statement
    
    ```rust
    pub (a) fn afn() {}
    ```
    
    Provide the following diagnostic:
    
    ```rust
    error: incorrect restriction in `pub`
      --> file.rs:15:1
       |
    15 | pub (a) fn afn() {}
       | ^^^^^^^
       |
       = help: some valid visibility restrictions are:
               `pub(crate)`: visible only on the current crate
               `pub(super)`: visible only in the current module's parent
               `pub(in path::to::module)`: visible only on the specified path
    help: to make this visible only to module `a`, add `in` before the path:
       | pub (in a) fn afn() {}
    ```
    
    Remove cruft from old `pub(path)` syntax.
    estebank committed Mar 23, 2017
    Configuration menu
    Copy the full SHA
    769b95d View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#40612 - TimNN:new-netbsd-cross, r=alexcrichton

    Use the "official" cross compiler for NetBSD
    
    The current NetBSD cross compiler is lacking, for example `std::thread` is not available (which causes problems for LLVM 4.0). This PR uses the official netbsd build system to compiler the cross compiler.
    
    @alexcrichton: Can you please mirror `ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.0/source/sets/{src,gnusrc,sharesrc,syssrc}.tgz`. (Optionally you may want to use NetBSD versions 7.0.2 or 7.1, in that case you'll probably want to update the binary downloads used today as well).
    
    I'll update the URL's afterwards (or feel free to use "allow edits from maintainers").
    
    r? @alexcrichton
    frewsxcv committed Mar 23, 2017
    Configuration menu
    Copy the full SHA
    4e96242 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#40627 - estebank:pub-restricted, r=petroche…

    …nkov
    
    Add diagnostic for incorrect `pub (restriction)`
    
    Given the following statement
    
    ```rust
    pub (a) fn afn() {}
    ```
    
    Provide the following diagnostic:
    
    ```rust
    error: incorrect restriction in `pub`
      --> file.rs:15:1
       |
    15 | pub (a) fn afn() {}
       |     ^^^
       |
       = help: some valid visibility restrictions are:
               `pub(crate)`: visible only on the current crate
               `pub(super)`: visible only in the current module's parent
               `pub(in path::to::module)`: visible only on the specified path
    help: to make this visible only to module `a`, add `in` before the path:
       | pub (in a) fn afn() {}
    ```
    
    Follow up to rust-lang#40340, fix rust-lang#40599, cc rust-lang#32409.
    frewsxcv committed Mar 23, 2017
    Configuration menu
    Copy the full SHA
    640dbbd View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#40668 - cramertj:on-demandify-more, r=nikom…

    …atsakis
    
    On-demandify associated item retrieval
    
    Part of rust-lang#40614.
    
    I also started converting `adt_def`, but I decided to open a PR with just this bit first to make sure I'm going about this correctly.
    
    r? @nikomatsakis
    frewsxcv committed Mar 23, 2017
    Configuration menu
    Copy the full SHA
    2233c6d View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#40715 - manuel-rhdt:patch-1, r=brson

    Fix doc error for ExactSizeIterator
    
    The code example in the trait documentation of ExactSizeIterator
    has an incorrect implementation of the len method that does not return
    the number of times the example iterator 'Counter' will iterate. This
    may confuse readers of the docs as the example code will compile but
    doesn't uphold the trait's contract.
    
    This is easily fixed by modifying the implementation of len and changing
    the assert statement to actually assert the correct behaviour. I also
    slightly modified a code comment to better reflect what the method
    returns.
    frewsxcv committed Mar 23, 2017
    Configuration menu
    Copy the full SHA
    08134cf View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#40753 - mandeep:change-ObjectSafetyViolatio…

    …n-message, r=brson
    
    Change object safety violation message
    
    Hello!
    
    This is my first pull request to rust so hopefully all goes well. This PR should fix issue rust-lang#40670. I changed the error message in object_safety.rs and the corresponding compile-fail test in object-safety-supertrait-mentions-Self.rs.
    
    Once the changes were made, I ran ```python x.py test src/tools/tidy``` and ```python x.py test```. Tidy passed and the compile-fail tests passed, however the test suite failed on the tcp tests as my machine has IPv6 disabled. I'm not sure what to do in this case besides letting travis run the suite against my changes. Please let me know if there's anything I can do to help further.
    
    Thanks!
    Mandeep
    frewsxcv committed Mar 23, 2017
    Configuration menu
    Copy the full SHA
    ea76c5e View commit details
    Browse the repository at this point in the history