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 9 pull requests #44155

Closed
wants to merge 26 commits into from
Closed

Rollup of 9 pull requests #44155

wants to merge 26 commits into from

Commits on Jul 23, 2017

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

Commits on Jul 25, 2017

  1. Slightly modify hint messages.

    qnighy committed Jul 25, 2017
    Configuration menu
    Copy the full SHA
    eeb16a1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c18c1d5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    51e92bb View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2cc7286 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2017

  1. Configuration menu
    Copy the full SHA
    24abea9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ca684a6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    59cff34 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2017

  1. Fail ./x.py on invalid command

    Make the ./x.py script fail when run with an invalid command, like:
    
      ./x.py nonsense
    
    This helps in case of chaining multiple runs, eg.:
    
      ./x.py biuld && ./x.py test
    vorner committed Aug 27, 2017
    Configuration menu
    Copy the full SHA
    6fc35de View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2017

  1. bootstrap: remove unneeded extern crate

    The crate itself is internally referenced by serde_derive.
    ishitatsuyuki committed Aug 28, 2017
    Configuration menu
    Copy the full SHA
    45d31ac View commit details
    Browse the repository at this point in the history
  2. un-regress behavior of unused_results lint for booleans

    This, as rust-lang#43813, is due to the author of rust-lang#43728 (specifically,
    3645b06) being a damnably contemptible fool. Before this entire
    fiasco, we would return early from the unusedness late lints pass if
    the type of the expression within the `hir::StmtSemi` was `!`, `()`,
    or a boolean: these types would never get to the point of being marked
    as unused results. That is, until the dunce who somehow (!?) came to
    be trusted with the plum responsibility of implementing RFC
    1940 (`#[must_use]` for functions) went and fouled everything up,
    removing the early returns based on the (stupid) thought that there
    would be no harm in it, since we would need to continue to check these
    types being returned from must_use functions (which was true for the
    booleans, at least). But there was harm—harm that any
    quarter-way-competent programmer would have surely forseen! For after
    the new functional-must-use checks, there was nothing to stop the
    previously-returned-early types from falling through to be marked by
    the unused-results lint!—a monumentally idiotic error that has cost
    the project tens of precious developer- and reviewer-minutes dealing
    with the fallout here and in rust-lang#43813.
    
    If 3645b06 is representative of the standard of craftsmanship the
    rising generation of software engineers holds themselves to, I weep
    for the future of our technological civilization.
    
    Resolves rust-lang#44119.
    zackmdavis committed Aug 28, 2017
    Configuration menu
    Copy the full SHA
    cc5ea04 View commit details
    Browse the repository at this point in the history
  3. compiletest: Change Config comments to doc comments

    Thomas Jespersen committed Aug 28, 2017
    Configuration menu
    Copy the full SHA
    2bffa31 View commit details
    Browse the repository at this point in the history
  4. Rewrite std::net::ToSocketAddrs doc examples.

    in particular:
    
    * show how to create an iterator that yields multiple socket addresses
    * show more failing scenarios
    frewsxcv committed Aug 28, 2017
    Configuration menu
    Copy the full SHA
    10bd39e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f50bf86 View commit details
    Browse the repository at this point in the history
  6. factor out helper method

    nikomatsakis committed Aug 28, 2017
    Configuration menu
    Copy the full SHA
    5c28740 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    4cd5314 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2017

  1. rustbuild: Fix dependencies of build-manifest

    No need to depend on librustc! All we need is libstd
    
    Closes rust-lang#44140
    alexcrichton committed Aug 29, 2017
    Configuration menu
    Copy the full SHA
    ecd127d View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#43426 - qnighy:intercrate-ambiguity-hints, …

    …r=nikomatsakis
    
    Add hints when intercrate ambiguity causes overlap.
    
    I'm going to tackle rust-lang#23980.
    
    # Examples
    
    ## Trait impl overlap caused by possible downstream impl
    
    ```rust
    trait Foo<X> {}
    trait Bar<X> {}
    impl<X, T> Foo<X> for T where T: Bar<X> {}
    impl<X> Foo<X> for i32 {}
    
    fn main() {}
    ```
    
    ```
    error[E0119]: conflicting implementations of trait `Foo<_>` for type `i32`:
     --> test1.rs:4:1
      |
    3 | impl<X, T> Foo<X> for T where T: Bar<X> {}
      | ------------------------------------------ first implementation here
    4 | impl<X> Foo<X> for i32 {}
      | ^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `i32`
      |
      = note: downstream crates may implement Bar
    
    error: aborting due to previous error
    ```
    
    ## Trait impl overlap caused by possible upstream update
    
    ```rust
    trait Foo {}
    impl<T> Foo for T where T: ::std::fmt::Octal {}
    impl Foo for () {}
    
    fn main() {}
    ```
    
    ```
    error[E0119]: conflicting implementations of trait `Foo` for type `()`:
     --> test2.rs:3:1
      |
    2 | impl<T> Foo for T where T: ::std::fmt::Octal {}
      | ----------------------------------------------- first implementation here
    3 | impl Foo for () {}
      | ^^^^^^^^^^^^^^^^^^ conflicting implementation for `()`
      |
      = note: upstream crates may add new impl for std::fmt::Octal in future versions
    
    error: aborting due to previous error
    ```
    
    ## Inherent impl overlap caused by possible downstream impl
    
    ```rust
    trait Bar<X> {}
    
    struct A<T, X>(T, X);
    impl<X, T> A<T, X> where T: Bar<X> { fn f(&self) {} }
    impl<X> A<i32, X> { fn f(&self) {} }
    
    fn main() {}
    ```
    
    ```
    error[E0592]: duplicate definitions with name `f`
     --> test3.rs:4:38
      |
    4 | impl<X, T> A<T, X> where T: Bar<X> { fn f(&self) {} }
      |                                      ^^^^^^^^^^^^^^ duplicate definitions for `f`
    5 | impl<X> A<i32, X> { fn f(&self) {} }
      |                     -------------- other definition for `f`
      |
      = note: downstream crates may implement Bar
    
    error: aborting due to previous error
    ```
    
    ## Inherent impl overlap caused by possible upstream update
    
    ```rust
    struct A<T>(T);
    
    impl<T> A<T> where T: ::std::fmt::Octal { fn f(&self) {} }
    impl A<()> { fn f(&self) {} }
    
    fn main() {}
    ```
    
    ```
    error[E0592]: duplicate definitions with name `f`
     --> test4.rs:3:43
      |
    3 | impl<T> A<T> where T: ::std::fmt::Octal { fn f(&self) {} }
      |                                           ^^^^^^^^^^^^^^ duplicate definitions for `f`
    4 | impl A<()> { fn f(&self) {} }
      |              -------------- other definition for `f`
      |
      = note: upstream crates may add new impl for std::fmt::Octal in future versions
    
    error: aborting due to previous error
    ```
    frewsxcv authored Aug 29, 2017
    Configuration menu
    Copy the full SHA
    e773897 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#44117 - frewsxcv:frewsxcv-to-socket-addrs-e…

    …xamples, r=QuietMisdreavus
    
    Rewrite `std::net::ToSocketAddrs` doc examples.
    
    in particular:
    
    * show how to create an iterator that yields multiple socket addresses
    * show more failing scenarios
    
    done this as preliminary work while investigating rust-lang#22569
    
    note: i haven't run doc tests on my machine for this, so would be good to confirm CI passes before approving
    frewsxcv authored Aug 29, 2017
    Configuration menu
    Copy the full SHA
    bd093cd View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#44121 - ishitatsuyuki:bootstrap-deps-purge,…

    … r=Mark-Simulacrum
    
    bootstrap: remove unneeded extern crate
    
    The crate itself is internally referenced by serde_derive.
    frewsxcv authored Aug 29, 2017
    Configuration menu
    Copy the full SHA
    18feb58 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#44122 - zackmdavis:booleans_were_not_unused…

    …_results, r=eddyb
    
    un-regress behavior of `unused_results` lint for booleans
    
    Resolves rust-lang#44119.
    frewsxcv authored Aug 29, 2017
    Configuration menu
    Copy the full SHA
    eefe818 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#44126 - laumann:config-doc-comments, r=niko…

    …matsakis
    
    compiletest: Change Config comments to doc comments
    
    I plan to make the same change in compiletest-rs, to have some documentation in [the docs](https://docs.rs/compiletest_rs/0.2.9/compiletest_rs/common/struct.Config.html).
    frewsxcv authored Aug 29, 2017
    Configuration menu
    Copy the full SHA
    f5c6d14 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#44134 - vorner:x-py-unknown-cmd, r=nikomats…

    …akis
    
    Fail ./x.py on invalid command
    
    Make the ./x.py script fail when run with an invalid command, like:
    
    ```
    ./x.py nonsense
    ```
    
    This helps in case of chaining multiple runs, eg.:
    
    ```
    ./x.py biuld && ./x.py test
    ```
    frewsxcv authored Aug 29, 2017
    Configuration menu
    Copy the full SHA
    3e2d5cb View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#44135 - GuillaumeGomez:fix-css-links, r=Qui…

    …etMisdreavus
    
    Fix invalid linker position
    
    Fixes rust-lang#44120.
    
    Result isn't "optimal" though because there are spaces at the end of some lines.
    frewsxcv authored Aug 29, 2017
    Configuration menu
    Copy the full SHA
    efa27ac View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#44138 - steveklabnik:rustdoc-deprecations, …

    …r=Manishearth
    
    Deprecate several flags in rustdoc
    
    Part of rust-lang#44136
    
    cc @rust-lang/dev-tools @rust-lang/docs
    
    This is a very basic PR to start deprecating some flags; `rustdoc` doesn't really have fancy output options like `rustc` does, so I went with `eprintln!`. Happy to change it if people feel that's not appropriate.
    
    Also, I have no idea if we can or should write tests here, so I didn't try. If someone feels strongly about it, then let's do it, but given that the only outcome here is a side effect...
    frewsxcv authored Aug 29, 2017
    Configuration menu
    Copy the full SHA
    44e03a4 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#44144 - alexcrichton:faster-hash-and-sign, …

    …r=Mark-Simulacrum
    
    rustbuild: Fix dependencies of build-manifest
    
    No need to depend on librustc! All we need is libstd
    
    Closes rust-lang#44140
    frewsxcv authored Aug 29, 2017
    Configuration menu
    Copy the full SHA
    00656fe View commit details
    Browse the repository at this point in the history