Skip to content

Rollup of 13 pull requests #36224

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.

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

Closed
wants to merge 29 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
0384722
Add `must_use` to the Reference
Aug 17, 2016
33560ee
add links to interesting items in `std::ptr` documentation
matthew-piziak Aug 21, 2016
89f7e92
demonstrate `RHS != Self` use cases for `Add` and `Sub`
matthew-piziak Aug 18, 2016
b5ce02c
remove references to `zero_memory` and `copy_memory`
matthew-piziak Aug 30, 2016
e0279d7
Normalize the function signature of closures
Aatch Aug 31, 2016
9a400f0
replace `../` with `../../std/` to support `core` docs
matthew-piziak Aug 31, 2016
1b04762
Special case a few colors for Windows
Aug 31, 2016
439afcd
Update error message for lifetime of borrowed values
Sep 1, 2016
7d5fa9e
configure: check if any of the arguments contain --help
0xmohit Sep 1, 2016
0f8eb81
Document try!'s error conversion behaviour
skade Aug 29, 2016
7cd4e7f
Fixed E0528 label and unit test
Sep 1, 2016
96283fc
test: Add a min-llvm-version directive
alexcrichton Sep 1, 2016
7f95bb0
Fixed E0529's label and unit test
Sep 2, 2016
3a96fe3
Transition Travis CI to use rustbuild.
frewsxcv Aug 31, 2016
2f2df2a
Update compiler error E0558 to use new error format
abhiQmar Sep 1, 2016
23ef388
Rollup merge of #35754 - QuietMisdreavus:must-use-reference, r=Manish…
Sep 2, 2016
2908ab2
Rollup merge of #35793 - matthew-piziak:add-rhs-example, r=steveklabnik
Sep 2, 2016
244a1e0
Rollup merge of #35880 - matthew-piziak:ptr-linking, r=steveklabnik
Sep 2, 2016
c77af26
Rollup merge of #36099 - skade:better-try-documentation, r=steveklabnik
Sep 2, 2016
d9893b3
Rollup merge of #36160 - Aatch:normalize-closure-sig, r=eddyb
Sep 2, 2016
0bbc6ec
Rollup merge of #36171 - jonathandturner:temporary_value, r=nikomatsakis
Sep 2, 2016
29077e8
Rollup merge of #36178 - jonathandturner:windows_colors, r=nikomatsakis
Sep 2, 2016
4a8069d
Rollup merge of #36180 - frewsxcv:patch-33, r=alexcrichton
Sep 2, 2016
c374d05
Rollup merge of #36190 - 0xmohit:pr/issue-31216, r=alexcrichton
Sep 2, 2016
9e60445
Rollup merge of #36198 - alexcrichton:fix-travis, r=brson
Sep 2, 2016
5a1661a
Rollup merge of #36205 - EugeneGonzalez:E0528, r=jonathandturner
Sep 2, 2016
b2dc7b1
Rollup merge of #36210 - EugeneGonzalez:E0529, r=jonathandturner
Sep 2, 2016
5f2e32d
Rollup merge of #36223 - abhiQmar:e0558-formatting, r=jonathandturner
Sep 2, 2016
4f449e2
Fix tidy warning
Sep 2, 2016
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
Fixed E0529's label and unit test
  • Loading branch information
Eugene R Gonzalez committed Sep 2, 2016
commit 7f95bb0dbd70e838d7cc12520135b08853c8b192
5 changes: 4 additions & 1 deletion src/librustc_typeck/check/_match.rs
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,10 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
_ => {}
}
}
err.emit();

err.span_label( pat.span,
&format!("pattern cannot match with input type `{}`", expected_ty)
).emit();
}
(tcx.types.err, tcx.types.err)
}
Expand Down
4 changes: 3 additions & 1 deletion src/test/compile-fail/E0529.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
fn main() {
let r: f32 = 1.0;
match r {
[a, b] => { //~ ERROR E0529
[a, b] => {
//~^ ERROR E0529
//~| NOTE pattern cannot match with input type `f32`
}
}
}