Rollup of 8 pull requests #40726
Closed
Rollup of 8 pull requests #40726
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
frewsxcv
commented
Mar 22, 2017
frewsxcv
commented
- Successful merges: Forbid conflicts between macros 1.0 exports and macros 2.0 exports #40509, rustbuild: Don't hardcode 'nightly' for Cargo #40515, add test for nested macro def (#31946) #40523, Update gcc used for dist-x86-linux builds #40617, Add docs for sort_unstable to unstable book #40619, Add whitespace around "=" in assoc items #40689, Fix invalid linking in iter docs #40690, str: Make docs consistently punctuated #40692
- Failed merges:
…[macro_reexport]`) and macros 2.0 exports (`pub use` macro re-exports and `pub macro` (once implemented) at the crate root.
It now follows rustc release trains
Adds a test for issue rust-lang#31946 which was fixed a while ago.
…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
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.
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.
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).
…e, r=frewsxcv Add docs for sort_unstable to unstable book Tracking issue for the feature: rust-lang#40585 r? @steveklabnik
…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">
…wsxcv Fix invalid linking in iter docs r? @rust-lang/docs
…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).
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @steveklabnik (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
|
@bors r+ p=10 |
|
📌 Commit 0c00b96 has been approved by |
|
⌛ Testing commit 0c00b96 with merge 21dc6b8... |
|
💔 Test failed - status-travis |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.