Skip to content

Various small diagnostic and code clean up #53842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 2, 2018
Merged

Various small diagnostic and code clean up #53842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70ed4f9
Point at def span on incorrect panic or alloc error handler
estebank Aug 30, 2018
da9ba98
Format code
estebank Aug 30, 2018
013710e
Use suggestion for dereference help
estebank Aug 30, 2018
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
16 changes: 10 additions & 6 deletions src/librustc_mir/hair/pattern/check_match.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,12 +540,16 @@ fn check_legality_of_move_bindings(cx: &MatchVisitor,
"cannot bind by-move into a pattern guard")
.span_label(p.span, "moves value into pattern guard")
.emit();
} else if by_ref_span.is_some() {
struct_span_err!(cx.tcx.sess, p.span, E0009,
"cannot bind by-move and by-ref in the same pattern")
.span_label(p.span, "by-move pattern here")
.span_label(by_ref_span.unwrap(), "both by-ref and by-move used")
.emit();
} else if let Some(by_ref_span) = by_ref_span {
struct_span_err!(
cx.tcx.sess,
p.span,
E0009,
"cannot bind by-move and by-ref in the same pattern",
)
.span_label(p.span, "by-move pattern here")
.span_label(by_ref_span, "both by-ref and by-move used")
.emit();
}
};

Expand Down
3 changes: 1 addition & 2 deletions src/librustc_save_analysis/span_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,7 @@ impl<'a> SpanUtils<'a> {
let loc = self.sess.source_map().lookup_char_pos(span.lo());
span_bug!(
span,
"Mis-counted brackets when breaking path? Parsing '{}' \
in {}, line {}",
"Mis-counted brackets when breaking path? Parsing '{}' in {}, line {}",
self.snippet(span),
loc.file.name,
loc.line
Expand Down
2 changes: 2 additions & 0 deletions src/librustc_typeck/check/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1178,6 +1178,7 @@ fn check_fn<'a, 'gcx, 'tcx>(inherited: &'a Inherited<'a, 'gcx, 'tcx>,
}
}
} else {
let span = fcx.tcx.sess.source_map().def_span(span);
fcx.tcx.sess.span_err(span, "function should have one argument");
}
} else {
Expand Down Expand Up @@ -1226,6 +1227,7 @@ fn check_fn<'a, 'gcx, 'tcx>(inherited: &'a Inherited<'a, 'gcx, 'tcx>,
}
}
} else {
let span = fcx.tcx.sess.source_map().def_span(span);
fcx.tcx.sess.span_err(span, "function should have one argument");
}
} else {
Expand Down
37 changes: 23 additions & 14 deletions src/librustc_typeck/check/op.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,14 +256,19 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
let source_map = self.tcx.sess.source_map();
match is_assign {
IsAssign::Yes => {
let mut err = struct_span_err!(self.tcx.sess, expr.span, E0368,
"binary assignment operation `{}=` \
cannot be applied to type `{}`",
op.node.as_str(),
lhs_ty);
err.span_label(lhs_expr.span,
format!("cannot use `{}=` on type `{}`",
op.node.as_str(), lhs_ty));
let mut err = struct_span_err!(
self.tcx.sess,
expr.span,
E0368,
"binary assignment operation `{}=` cannot be applied to type `{}`",
op.node.as_str(),
lhs_ty,
);
err.span_label(
lhs_expr.span,
format!("cannot use `{}=` on type `{}`",
op.node.as_str(), lhs_ty),
);
let mut suggested_deref = false;
if let Ref(_, mut rty, _) = lhs_ty.sty {
if {
Expand All @@ -280,13 +285,17 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
rty = rty_inner;
}
let msg = &format!(
"`{}=` can be used on '{}', you can \
dereference `{2}`: `*{2}`",
op.node.as_str(),
rty,
lstring
"`{}=` can be used on '{}', you can dereference `{}`",
op.node.as_str(),
rty,
lstring,
);
err.span_suggestion_with_applicability(
lhs_expr.span,
msg,
format!("*{}", lstring),
errors::Applicability::MachineApplicable,
);
err.help(msg);
suggested_deref = true;
}
}
Expand Down
6 changes: 2 additions & 4 deletions src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
error: function should have one argument
--> $DIR/alloc-error-handler-bad-signature-3.rs:20:1
|
LL | / fn oom() -> ! { //~ ERROR function should have one argument
LL | | loop {}
LL | | }
| |_^
LL | fn oom() -> ! { //~ ERROR function should have one argument
| ^^^^^^^^^^^^^

error: aborting due to previous error

4 changes: 3 additions & 1 deletion src/test/ui/issues/issue-5239-1.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ LL | let x = |ref x: isize| { x += 1; };
| -^^^^^
| |
| cannot use `+=` on type `&isize`
help: `+=` can be used on 'isize', you can dereference `x`
|
= help: `+=` can be used on 'isize', you can dereference `x`: `*x`
LL | let x = |ref x: isize| { *x += 1; };
| ^^

error: aborting due to previous error

Expand Down
6 changes: 2 additions & 4 deletions src/test/ui/panic-handler/panic-handler-bad-signature-3.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
error: function should have one argument
--> $DIR/panic-handler-bad-signature-3.rs:20:1
|
LL | / fn panic() -> ! { //~ ERROR function should have one argument
LL | | loop {}
LL | | }
| |_^
LL | fn panic() -> ! { //~ ERROR function should have one argument
| ^^^^^^^^^^^^^^^

error: aborting due to previous error