Some tweaks to "type parameters from outer function" diagnostic #49007
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
|
r? @pnkfelix (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
oli-obk
requested changes
Mar 14, 2018
| @@ -11,7 +11,7 @@ | |||
| trait Baz<T> {} | |||
|
|
|||
| fn foo<T>(x: T) { | |||
| fn bar<U, V: Baz<U>, W: Fn()>(y: T) { //~ ERROR E0401 | |||
| fn bfnr<U, V: Baz<U>, W: Fn()>(y: T) { //~ ERROR E0401 | |||
There was a problem hiding this comment.
This function is called below, so you need to rename the call, too. Or just undo the rename
src/librustc_resolve/lib.rs
Outdated
| @@ -61,6 +61,7 @@ use syntax::feature_gate::{feature_err, emit_feature_err, GateIssue}; | |||
| use syntax::parse::token; | |||
| use syntax::ptr::P; | |||
|
|
|||
|
|
|||
src/librustc_resolve/lib.rs
Outdated
| fn generate_fn_name_span(cm: &CodeMap, span: Span) -> Option<Span> { | ||
| let prev_span = cm.span_extend_to_prev_str(span, "fn", true); | ||
| cm.span_to_snippet(prev_span).map(|snippet| { | ||
| let len: usize = snippet.chars() |
There was a problem hiding this comment.
This could be snippet.find(|c| !c.is_alphanumeric() && *c != '_').expect("no label after fn")
src/librustc_resolve/lib.rs
Outdated
| *c == '_') { | ||
| offset += c.len_utf8(); | ||
| } | ||
| let mut offset = snippet.chars() |
estebank
force-pushed
the
follow-up-47574
branch
3 times, most recently
from
e75da69
to
7cacfd2
Compare
estebank
force-pushed
the
follow-up-47574
branch
from
7cacfd2
to
16d424f
Compare
|
@bors r=oli-obk rollup |
|
📌 Commit 16d424f has been approved by |
bors
added
S-waiting-on-bors
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Mar 15, 2018
Some tweaks to "type parameters from outer function" diagnostic Follow up to rust-lang#47574.
bors
added a commit
that referenced
this pull request
Mar 16, 2018
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.
Follow up to #47574.