Rollup of 7 pull requests #41987
Merged
Rollup of 7 pull requests #41987
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
Mark-Simulacrum
commented
May 14, 2017
Mark-Simulacrum
commented
- Successful merges: Added generic example of std::ops::Add in doc comments #41612, Add markdown-[before|after]-content options #41826, rustc_resolve: don't deny outer type parameters in embedded constants. #41939, Disallow ._ in float literal. #41946, Fix anchor invalid redirection to search #41950, Pass static crt to llvm cmake configuration #41975, LLVM: Add support for EABI-compliant libcalls on MSP430. #41979
- Failed merges:
Added blank lines around example Added comment to Add example referencing the Output type Removed whitespace from lines 272 and 273 Removed Debug derivation from Add examples Added Debug derivation
This change will allow rust code to have proper support for division and multiplication using libgcc libcalls.
…meGomez,frewsxcv Added generic example of std::ops::Add in doc comments We discussed on IRC how the std::ops examples were potentially missing examples using generics. This PR adds an example to std::ops::Add that shows the use of a generic type T. I'm not sure this is ready for merge as I think the two examples now make the documentation a bit verbose, but I think it's a good starting point. I'd love to hear others thoughts on this. This is in relation to the last item in issue rust-lang#29365.
…, r=frewsxcv Add markdown-[before|after]-content options cc @nical r? @rust-lang/docs
…petrochenkov rustc_resolve: don't deny outer type parameters in embedded constants. This solves a problem noted at rust-lang#29646 (comment), where an associated const default in a trait couldn't refer to `Self` or type parameters, due to inaccuracies in lexical scoping. I've also allowed "embedded expressions" (`[T; expr]`, `[x; expr]`, `typeof expr`) to refer to type parameters in scope. *However*, the typesystem still doesn't handle rust-lang#34344. Fully resolving that issue requires breaking cycles more aggressively (e.g. lazy evaluation), *even* in when the expression doesn't depend on type parameters, to type-check it at all, and then also type-level "constant projections" (in the vein of `{expr}` from const generics).
…loat, r=petrochenkov Disallow ._ in float literal. This patch makes lexer stop parsing number literals before `._`, as well as before `.a`. Underscore itself is still allowed like in `4_000_000.000_000_`. Fixes a half part of rust-lang#41723. The other is `""_`.
…wsxcv Fix anchor invalid redirection to search Fixes rust-lang#41933. r? @rust-lang/docs
…-cmake-config, r=alexcrichton Pass static crt to llvm cmake configuration Solves rust-lang#40246
…hton LLVM: Add support for EABI-compliant libcalls on MSP430. This change will allow rust code to have proper support for division and multiplication using libgcc. r? @alexcrichton cc @awygle
|
Some changes occurred in HTML/CSS. |
|
r? @brson (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ p=10 |
|
📌 Commit 7294ce1 has been approved by |
|
⌛ Testing commit 7294ce1 with merge 94497b7... |
bors
added a commit
that referenced
this pull request
May 14, 2017
|
☀️ Test successful - status-appveyor, status-travis |
This was referenced May 14, 2017
Merged
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.