Skip to content

Rollup of 5 pull requests #57599

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 35 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
f9f71cc
Fix poor worst case performance of set intersection (and union, somew…
ssomers Dec 21, 2018
ccba43d
Merge remote-tracking branch 'upstream/master'
ssomers Jan 9, 2019
60d1db6
Clean up and fix a bug in query plumbing
Zoxc Jan 9, 2019
8823bf0
Fix poor worst case performance of is_disjoint
ssomers Jan 9, 2019
565c39d
provide suggestion for invalid boolean cast
euclio Jan 9, 2019
cef2e2f
Merge remote-tracking branch 'upstream/master'
ssomers Jan 10, 2019
5c67ba6
Continue parser after trailing type argument attribute
estebank Jan 12, 2019
fc4b541
Continue parsing after lifetime in incorrect location
estebank Jan 12, 2019
d8610b3
Continue evaluating after parsing incorrect binary literal
estebank Jan 12, 2019
5d2f31c
Continue evaluating after missing `for` in `impl Trait for Foo`
estebank Jan 12, 2019
57f17e9
Continue evaluating after type argument in where clause
estebank Jan 12, 2019
65a8d7b
fix tests
estebank Jan 12, 2019
8bede50
Continue evaluating after incorrect float literal
estebank Jan 12, 2019
975f8b5
fix test
estebank Jan 12, 2019
8119017
Continue evaluating after finding incorrect .. in pattern
estebank Jan 12, 2019
de3c4be
Tweak type argument after assoc type error
estebank Jan 12, 2019
7feb802
Small tweaks to parser errors
estebank Jan 12, 2019
3ead6de
Tweak incorrect discriminator value variant error
estebank Jan 12, 2019
1550787
Add label for invalid literal suffix
estebank Jan 12, 2019
db74031
Remove unrelated errors from parse stderr tests
estebank Jan 13, 2019
28ea03e
Suggest correct location for lifetime parameters in use
estebank Jan 13, 2019
c4f6ef2
remove extern_in_paths.
Centril Jan 13, 2019
fb60400
Querify local proc_macro_decls_static
Xanewok Jan 12, 2019
59d7d7d
Querify local plugin_registrar_fn
Xanewok Jan 13, 2019
707a9a0
Retain original pass order
Xanewok Jan 13, 2019
3874c77
Recover from item trailing semicolon
estebank Jan 14, 2019
1fd971c
Add a debug_assert to Vec::set_len
scottmcm Dec 15, 2018
d0c084a
Rollup merge of #57043 - ssomers:master, r=alexcrichton
Centril Jan 14, 2019
55d835c
Rollup merge of #57480 - Zoxc:query-fix, r=michaelwoerister
Centril Jan 14, 2019
e915165
Rollup merge of #57481 - euclio:bool-cast-suggestion, r=estebank
Centril Jan 14, 2019
ce1f3e3
Rollup merge of #57540 - estebank:eval-more, r=petrochenkov
Centril Jan 14, 2019
64c9015
Rollup merge of #57570 - Xanewok:querify-some, r=Zoxc
Centril Jan 14, 2019
9f52fbb
Rollup merge of #57572 - Centril:unaccept-extern-in-path, r=petrochenkov
Centril Jan 14, 2019
286aa24
Rollup merge of #57585 - estebank:trailing-semicolon, r=petrochenkov
Centril Jan 14, 2019
c1f0f04
Rollup merge of #57589 - scottmcm:vec-set_len-debug_assert, r=alexcri…
Centril Jan 14, 2019
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
Continue evaluating after type argument in where clause
  • Loading branch information
estebank committed Jan 12, 2019
commit 57f17e91d08b038a76e175bf2bbd36147d889eb0
8 changes: 6 additions & 2 deletions src/libsyntax/parse/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5393,8 +5393,12 @@ impl<'a> Parser<'a> {
// change we parse those generics now, but report an error.
if self.choose_generics_over_qpath() {
let generics = self.parse_generics()?;
self.span_err(generics.span,
"generic parameters on `where` clauses are reserved for future use");
self.struct_span_err(
generics.span,
"generic parameters on `where` clauses are reserved for future use",
)
.span_label(generics.span, "currently unsupported")
.emit();
}

loop {
Expand Down
1 change: 1 addition & 0 deletions src/test/ui/parser/where_with_bound.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
fn foo<T>() where <T>::Item: ToString, T: Iterator { }
//~^ ERROR generic parameters on `where` clauses are reserved for future use
//~| ERROR cannot find type `Item` in the crate root

fn main() {}
11 changes: 9 additions & 2 deletions src/test/ui/parser/where_with_bound.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@ error: generic parameters on `where` clauses are reserved for future use
--> $DIR/where_with_bound.rs:1:19
|
LL | fn foo<T>() where <T>::Item: ToString, T: Iterator { }
| ^^^
| ^^^ currently unsupported

error: aborting due to previous error
error[E0412]: cannot find type `Item` in the crate root
--> $DIR/where_with_bound.rs:1:24
|
LL | fn foo<T>() where <T>::Item: ToString, T: Iterator { }
| ^^^^ not found in the crate root

error: aborting due to 2 previous errors

For more information about this error, try `rustc --explain E0412`.