Rollup of 13 pull requests #40748
Merged
Rollup of 13 pull requests #40748
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, add test for nested macro def (#31946) #40523, appveyor: Use Ninja to build LLVM on MinGW #40548, Make the filenames of .stamp files generated by compiletest shorter #40578, 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, Nit: LLVM & Clang latest version is 4.0 #40704, Various fixes to wording consistency in the docs #40722, E0090: Add explanation for error message #40723, Remove duplicated styling in main.css #40725, Update the book submodule and fix tidy #40732
- Failed merges:
…[macro_reexport]`) and macros 2.0 exports (`pub use` macro re-exports and `pub macro` (once implemented) at the crate root.
Adds a test for issue rust-lang#31946 which was fixed a while ago.
Otherwise we run into filename length limitations on some file systems (especially ecryptfs).
I have a suspicion that MinGW's make is the cause of rust-lang#40546 rather than anything else, but that's purely a suspicion without any facts to back it up. In any case we'll eventually be moving the MSVC build over to Ninja in order to leverage sccache regardless, so this commit simply jumpstarts that process by downloading Ninja for use by MinGW anyway. I'm not sure if this closes rust-lang#40546 for real, but this is my current best shot at closing it out, so... Closes rust-lang#40546
…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
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.
appveyor: Use Ninja to build LLVM on MinGW I have a suspicion that MinGW's make is the cause of rust-lang#40546 rather than anything else, but that's purely a suspicion without any facts to back it up. In any case we'll eventually be moving the MSVC build over to Ninja in order to leverage sccache regardless, so this commit simply jumpstarts that process by downloading Ninja for use by MinGW anyway. I'm not sure if this closes rust-lang#40546 for real, but this is my current best shot at closing it out, so... Closes rust-lang#40546
…t-stamps, r=alexcrichton Make the filenames of .stamp files generated by compiletest shorter Otherwise we run into filename length limitations on some file systems. See https://bugs.launchpad.net/ecryptfs/+bug/344878 for an example where we only can have ~145 characters for filenames. r? @alexcrichton
…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).
…richton Nit: LLVM & Clang latest version is 4.0 Small nit: since latest Clang version is 4.0 it's nice to reflect this in the documentation. Also, I couldn't find anything, but there might be any hard-coded check that Clang version matches "3.X" anywhere in the build system; if there is one, it'd be great to bump that one too.
…teveklabnik Various fixes to wording consistency in the docs A bunch of random fixes, added punctuation, plurals, backticks, and so on... r? @steveklabnik
…r=estebank E0090: Add explanation for error message See rust-lang#32777 $ rustc --explain E0090 The wrong number of lifetimes were supplied. For example: ``` fn foo<'a: 'b, 'b: 'a>() {} fn main() { foo::<'static>(); // error, expected 2 lifetime parameters } ```
Remove duplicated styling in main.css If nothing else, it saves a bit of data.
Update the book submodule and fix tidy When the book was included into https:/rust-lang/rust as a submodule, tidy started failing on Windows. rust-lang/book#549 fixed the problem, now the submodule needs to be updated.
|
Some changes occurred in HTML/CSS. |
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @pnkfelix (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 0e57709 has been approved by |
|
☀️ Test successful - status-appveyor, status-travis |
This was referenced Mar 23, 2017
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.