Rollup of 8 pull requests #41846
Merged
Rollup of 8 pull requests #41846
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
May 9, 2017
frewsxcv
commented
- Successful merges: Implement the illegal_floating_point_literal_pattern compat lint #41293, Use diagnostics for trace_macro instead of println #41520, Allow bare CR in ////-style comment. #41827, try to fix lvalue ops for real #41828, Update save-analysis deps and RLS submodule #41833, Update rustc-ux-guidelines #41836, Fixed argument inference for closures when coercing into 'fn' #41838, Fix typo in subst.rs #41842
- Failed merges:
Adds a compatibility lint to disallow floating point literals in patterns like in match. See the tracking issue rust-lang#41620.
Hopefully this is the last PR needed. Fixes rust-lang#41726. Fixes rust-lang#41742. Fixes rust-lang#41774.
1) changed "long way into" to "long way toward" 2) changed "developer lives" to "developers' lives" 3) removed the "either... or..." format from second paragraph because there are more than 2 options 4) Minor revisions to paragraphs 3-6 to make them more consistent in format and to fix minor grammar issues.
"A `note` to emitted to" changed to "A `note` is emitted to"
…omatsakis Implement the illegal_floating_point_literal_pattern compat lint Adds a future-compatibility lint for the [breaking-change] introduced by issue rust-lang#41620 . cc issue rust-lang#41255 .
Use diagnostics for trace_macro instead of println
When using `trace_macro`, use `span_label`s instead of `println`:
```rust
note: trace_macro
--> $DIR/trace-macro.rs:14:5
|
14 | println!("Hello, World!");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: expands to `println! { "Hello, World!" }`
= note: expands to `print! { concat ! ( "Hello, World!" , "\n" ) }`
```
Fix rust-lang#22597.
…ent, r=estebank Allow bare CR in ////-style comment. Fixes rust-lang#40624 in a way that bare CR is allowed in all non-doc comments.
try to fix lvalue ops for real Hopefully this is the last PR needed. Fixes rust-lang#41726. Fixes rust-lang#41742. Fixes rust-lang#41774.
Update save-analysis deps and RLS submodule
@bors: r+ 38fe8d2 rollup 1) changed "long way into" to "long way toward" 2) changed "developer lives" to "developers' lives" 3) removed the "either... or..." format from second paragraph because there are more than 2 options 4) Minor revisions to paragraphs 3-6 to make them more consistent in format and to fix minor grammar issues.
…, r=nikomatsakis Fixed argument inference for closures when coercing into 'fn' This fixes rust-lang#41755. The tests `compile-fail/closure-no-fn.rs` and `compile-fail/issue-40000.rs` were modified. A new test `run-pass/closure_to_fn_coercion-expected-types.rs` was added r? @nikomatsakis
Fix typo in subst.rs Changed "unknwon" to "unknown".
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @eddyb (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 f21209f has been approved by |
bors
added a commit
that referenced
this pull request
May 9, 2017
|
☀️ Test successful - status-appveyor, status-travis |
This was referenced May 9, 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.