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 8 pull requests #40726

Closed
wants to merge 16 commits into from
Closed

Rollup of 8 pull requests #40726

wants to merge 16 commits into from

Commits on Mar 21, 2017

  1. Configuration menu
    Copy the full SHA
    88d5645 View commit details
    Browse the repository at this point in the history
  2. str: Make docs consistently punctuated

    SamWhited authored and bstrie committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    49db656 View commit details
    Browse the repository at this point in the history
  3. Fix invalid linking in iter docs

    GuillaumeGomez authored and bstrie committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    ed5702f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f531722 View commit details
    Browse the repository at this point in the history
  5. Check for conflicts between macros 1.0 exports (#[macro_export], `#…

    …[macro_reexport]`)
    
    and macros 2.0 exports (`pub use` macro re-exports and `pub macro` (once implemented)
    at the crate root.
    jseyfried authored and retep998 committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    678e882 View commit details
    Browse the repository at this point in the history
  6. rustbuild: Don't hardcode 'nightly' for Cargo

    It now follows rustc release trains
    alexcrichton authored and retep998 committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    fe2b7a4 View commit details
    Browse the repository at this point in the history
  7. add test for nested macro def (rust-lang#31946)

    Adds a test for issue rust-lang#31946 which was fixed a while ago.
    durka authored and retep998 committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    7551e71 View commit details
    Browse the repository at this point in the history
  8. Add docs for sort_unstable to unstable book

    Stjepan Glavina committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    6acbbc6 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2017

  1. Rollup merge of rust-lang#40509 - jseyfried:duplicate_check_macro_exp…

    …orts, r=nrc
    
    Forbid conflicts between macros 1.0 exports and macros 2.0 exports
    
    This PR forbids for conflicts between `#[macro_export]`/`#[macro_reexport]` macro exports and `pub use` macro exports. For example,
    ```rust
    // crate A:
    pub use macros::foo;
    //^ This is allowed today, will be forbidden by this PR.
    
    // crate B:
    extern crate A; // This triggers a confusing error today.
    use A::foo; // This could refer to refer to either macro export in crate A.
    ```
    
    r? @nrc
    frewsxcv authored Mar 22, 2017
    Configuration menu
    Copy the full SHA
    25c2d65 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#40515 - alexcrichton:tarball-names, r=brson

    rustbuild: Don't hardcode 'nightly' for Cargo
    
    It now follows rustc release trains. I also had to land this commit on beta (rust-lang@0a27a87) before rust-lang#40484 could land, so this is basically just a forward port (if you will) of that commit to master.
    frewsxcv authored Mar 22, 2017
    Configuration menu
    Copy the full SHA
    b949f8e View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#40523 - durka:patch-38, r=petrochenkov

    add test for nested macro def (rust-lang#31946)
    
    Adds a test for issue rust-lang#31946 which was fixed in 1.12.0.
    
    Closes rust-lang#31946.
    frewsxcv authored Mar 22, 2017
    Configuration menu
    Copy the full SHA
    2de14f6 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#40617 - TimNN:dist-update-gcc, r=alexcrichton

    Update gcc used for dist-x86-linux builds
    
    GCC 4.7 is too old to build LLVM 4.0, so this PR updates to 4.8.
    
    r? @alexcrichton (I'll ping you again once travis is green and the test commit is removed).
    frewsxcv authored Mar 22, 2017
    Configuration menu
    Copy the full SHA
    c5f3bf1 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#40619 - stjepang:unstable-book-sort-unstabl…

    …e, r=frewsxcv
    
    Add docs for sort_unstable to unstable book
    
    Tracking issue for the feature: rust-lang#40585
    
    r? @steveklabnik
    frewsxcv authored Mar 22, 2017
    Configuration menu
    Copy the full SHA
    a24c81d View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#40689 - GuillaumeGomez:rustdoc-associated-t…

    …ype-formatting, r=frewsxcv
    
    Add whitespace around "=" in assoc items
    
    Part of rust-lang#40641.
    
    r? @rust-lang/docs
    
    Before:
    
    <img width="1440" alt="screen shot 2017-03-20 at 22 42 34" src="https://cloud.githubusercontent.com/assets/3050060/24123102/89181d8c-0dbe-11e7-897c-841497cf7001.png">
    
    After:
    
    <img width="1440" alt="screen shot 2017-03-20 at 22 42 36" src="https://cloud.githubusercontent.com/assets/3050060/24123118/8dec176e-0dbe-11e7-9759-cabbd062a4c2.png">
    frewsxcv authored Mar 22, 2017
    Configuration menu
    Copy the full SHA
    8e77377 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#40690 - GuillaumeGomez:fix-iter-docs, r=fre…

    …wsxcv
    
    Fix invalid linking in iter docs
    
    r? @rust-lang/docs
    frewsxcv authored Mar 22, 2017
    Configuration menu
    Copy the full SHA
    5f6edf4 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#40692 - SamWhited:consistent_str_docs_punct…

    …uation, r=bstrie
    
    str: Make docs consistently punctuated
    
    Every so slightly pointless one character PR, but this was driving me nuts while reading the docs a moment ago (all the [other public structs](https://doc.rust-lang.org/std/str/index.html#structs) have descriptions that end in a full-stop).
    frewsxcv authored Mar 22, 2017
    Configuration menu
    Copy the full SHA
    0c00b96 View commit details
    Browse the repository at this point in the history