Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
f8b66a0
trace_macro: Show both the macro call and its expansion. #42072.
jorendorff May 19, 2017
0b85b64
libstd/sync/mpsc: relicense under rust license
dvyukov May 22, 2017
6dde3f4
Move some tests from compile-fail to ui
oli-obk May 16, 2017
ec1fa6d
Change macro typo helps to suggestions
oli-obk May 16, 2017
27359bd
Change enum variant help into a suggestion
oli-obk May 16, 2017
e328ef0
Change some "did you mean `self.*`" messages to suggestions
oli-obk May 16, 2017
8add02a
Changes in ui tests
oli-obk May 16, 2017
e618a4f
Add some guidelines for suggestion messages and follow them
oli-obk May 18, 2017
a9b54ab
Update ui tests output
oli-obk May 18, 2017
9d41d0e
Move a compile-fail test to ui
oli-obk May 18, 2017
bff4795
Tidy errors
oli-obk May 18, 2017
6f681c2
Fix line numbers in ui test
oli-obk May 22, 2017
1343bc6
Readd //~ERROR messages
oli-obk May 22, 2017
14b767d
Add example of recursive drop to Drop trait.
Havvy May 22, 2017
ca909c8
Add example of variable declaration drop order to Drop trait.
Havvy May 22, 2017
d7927ff
Add description of how values are dropped to Drop trait.
Havvy May 22, 2017
5f4b0ff
Fix trailing whitespace.
Havvy May 22, 2017
72eb010
update-all-references.sh doesn't deterministically work on ui-fulldeps
oli-obk May 23, 2017
b41b294
Suggested changes by birkenfeld
Havvy May 23, 2017
57f260d
Override size_hint and propagate ExactSizeIterator for iter::StepBy
scottmcm May 23, 2017
4be488c
Add iterator_step_by to the unstable book's summary
scottmcm May 21, 2017
fcb3a71
Update description of iter::StepBy
scottmcm May 21, 2017
794e572
Give step_trait a distinct tracking issue from step_by
scottmcm May 23, 2017
e860655
Remove some needless // gate-test- comments
est31 May 23, 2017
c20a157
Rollup merge of #42033 - oli-obk:suggestions, r=petrochenkov
Mark-Simulacrum May 23, 2017
84db8c1
Rollup merge of #42103 - jorendorff:master, r=estebank
Mark-Simulacrum May 23, 2017
7e4dda1
Rollup merge of #42149 - dvyukov:license, r=brson
Mark-Simulacrum May 23, 2017
20a5a5d
Rollup merge of #42159 - Havvy:doc-drop, r=steveklabnik
Mark-Simulacrum May 23, 2017
99dca25
Rollup merge of #42167 - scottmcm:iter-stepby-sizehint, r=alexcrichton
Mark-Simulacrum May 23, 2017
30a272e
Rollup merge of #42169 - scottmcm:new-step-trait-issue, r=alexcrichton
Mark-Simulacrum May 23, 2017
d8afdf1
Rollup merge of #42177 - est31:master, r=Mark-Simulacrum
Mark-Simulacrum May 23, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Change some "did you mean self.*" messages to suggestions
  • Loading branch information
oli-obk committed May 22, 2017
commit e328ef06e1756f680c513875c424e925e81885b4
10 changes: 6 additions & 4 deletions src/librustc_resolve/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2323,18 +2323,20 @@ impl<'a> Resolver<'a> {
let self_is_available = this.self_value_is_available(path[0].ctxt, span);
match candidate {
AssocSuggestion::Field => {
err.span_label(span, format!("did you mean `self.{}`?", path_str));
err.span_suggestion(span, "did you mean",
format!("self.{}", path_str));
if !self_is_available {
err.span_label(span, format!("`self` value is only available in \
methods with `self` parameter"));
}
}
AssocSuggestion::MethodWithSelf if self_is_available => {
err.span_label(span, format!("did you mean `self.{}(...)`?",
path_str));
err.span_suggestion(span, "did you mean",
format!("self.{}", path_str));
}
AssocSuggestion::MethodWithSelf | AssocSuggestion::AssocItem => {
err.span_label(span, format!("did you mean `Self::{}`?", path_str));
err.span_suggestion(span, "did you mean",
format!("Self::{}", path_str));
}
}
return err;
Expand Down