Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
877c5e9
[BETA] Update cargo
ehuss Mar 15, 2019
b72af83
Include bounds from promoted constants in NLL
matthewjasper Jan 17, 2019
1824067
Remove unnecessary parameter
matthewjasper Jan 17, 2019
e2a0a83
Handle type annotations in promoted MIR correctly
matthewjasper Feb 27, 2019
11bd998
Temporarily emulate the (accidentally) omitted recursion during impl …
pnkfelix Feb 20, 2019
a35c8e8
Unit (and regression) tests for warning cycle code.
pnkfelix Feb 22, 2019
1d6d40b
Revised warning-downgrade strategy for nested impl trait.
pnkfelix Mar 11, 2019
7f31bab
Test illustrating that the nested_impl_trait lint should only catch s…
pnkfelix Mar 11, 2019
8df3fb6
Addressed review feedback regarding comment phrasing.
pnkfelix Mar 12, 2019
4e1c03b
Don't promote function calls to nonpromotable things
oli-obk Feb 27, 2019
eedebbc
Schedule the demolition of `IsNotPromotable`
oli-obk Mar 1, 2019
ad293f1
Make migrate mode work at item level granularity
matthewjasper Feb 27, 2019
363024d
Expand where negative supertrait specific error is shown
estebank Mar 1, 2019
d954246
Do not panic on missing close paren
estebank Mar 2, 2019
8470916
Bail when encountering a second unexpected token in the same span
estebank Mar 2, 2019
d60f22c
Emit unclosed delimiters during recovery
estebank Mar 2, 2019
a5c464a
Reduce test case
estebank Mar 2, 2019
d5b3606
Panic when unmatched delimiters aren't emitted
estebank Mar 3, 2019
d21b852
Emit missing unclosed delimiter errors
estebank Mar 3, 2019
a460b4b
Collect unclosed delimiters in parent parser
estebank Mar 3, 2019
51c47f3
Always emit mismatched delim errors, never panic
estebank Mar 3, 2019
e808e1e
Add regression test for #58886
estebank Mar 4, 2019
78554ed
Simplify code
estebank Mar 4, 2019
159cc95
Rely on drop to emit unclosed delims
estebank Mar 7, 2019
0e9e6ec
Rollup merge of #59217 - ehuss:update-beta-cargo, r=alexcrichton
pietroalbini Mar 16, 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
Add regression test for #58886
  • Loading branch information
estebank authored and pietroalbini committed Mar 16, 2019
commit e808e1e0f0a7454c4cf2261c2a9c4d67af1a5e47
6 changes: 6 additions & 0 deletions src/test/ui/parser/unclosed-delimiter-in-dep.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
mod unclosed_delim_mod;

fn main() {
let _: usize = unclosed_delim_mod::new();
//~^ ERROR mismatched types
}
23 changes: 23 additions & 0 deletions src/test/ui/parser/unclosed-delimiter-in-dep.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
error: incorrect close delimiter: `}`
--> $DIR/unclosed_delim_mod.rs:5:1
|
LL | pub fn new() -> Result<Value, ()> {
| - close delimiter possibly meant for this
LL | Ok(Value {
| - un-closed delimiter
LL | }
LL | }
| ^ incorrect close delimiter

error[E0308]: mismatched types
--> $DIR/unclosed-delimiter-in-dep.rs:4:20
|
LL | let _: usize = unclosed_delim_mod::new();
| ^^^^^^^^^^^^^^^^^^^^^^^^^ expected usize, found enum `std::result::Result`
|
= note: expected type `usize`
found type `std::result::Result<unclosed_delim_mod::Value, ()>`

error: aborting due to 2 previous errors

For more information about this error, try `rustc --explain E0308`.
6 changes: 6 additions & 0 deletions src/test/ui/parser/unclosed_delim_mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pub struct Value {}
pub fn new() -> Result<Value, ()> {
Ok(Value {
}
}
//~^ ERROR incorrect close delimiter
18 changes: 18 additions & 0 deletions src/test/ui/parser/unclosed_delim_mod.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
error: incorrect close delimiter: `}`
--> $DIR/unclosed_delim_mod.rs:5:1
|
LL | pub fn new() -> Result<Value, ()> {
| - close delimiter possibly meant for this
LL | Ok(Value {
| - un-closed delimiter
LL | }
LL | }
| ^ incorrect close delimiter

error[E0601]: `main` function not found in crate `unclosed_delim_mod`
|
= note: consider adding a `main` function to `$DIR/unclosed_delim_mod.rs`

error: aborting due to 2 previous errors

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