Skip to content
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

Remove `ObsoleteInPlace` #60803

Merged
merged 2 commits into from May 24, 2019
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

Prev

Update tests

  • Loading branch information...
varkor committed May 13, 2019
commit 36f654262d05a65c41efdbac0ddeffa9bac8ae21
@@ -1,18 +1,19 @@
error: emplacement syntax is obsolete (for now, anyway)
--> $DIR/bad.rs:9:5
|
LL | x <- y;
| ^^^^^^
|
= note: for more information, see <https://github.com/rust-lang/rust/issues/27779#issuecomment-378416911>

error: emplacement syntax is obsolete (for now, anyway)
error: expected expression, found keyword `in`
--> $DIR/bad.rs:10:5
|
LL | in(foo) { bar };
| ^^^^^^^^^^^^^^^
| ^^ expected expression

error[E0282]: type annotations needed
--> $DIR/bad.rs:9:8
|
LL | let (x, y, foo, bar);
| ---------------- consider giving the pattern a type
LL | x <- y;
| ^^^ cannot infer type
|
= note: for more information, see <https://github.com/rust-lang/rust/issues/27779#issuecomment-378416911>
= note: type must be known at this point

error: aborting due to 2 previous errors

For more information about this error, try `rustc --explain E0282`.
@@ -1,15 +1,12 @@
// Check that `<-` and `in` syntax gets a hard error.

// revisions: good bad
//[good] run-pass

#[cfg(bad)]
fn main() {
let (x, y, foo, bar);
x <- y; //[bad]~ ERROR emplacement syntax is obsolete
in(foo) { bar }; //[bad]~ ERROR emplacement syntax is obsolete
fn foo() {
let (x, y) = (0, 0);
x <- y; //~ ERROR expected one of
//~^ ERROR mismatched types
}

#[cfg(good)]
fn main() {
let (foo, bar) = (0, 0);
in(foo) { bar }; //~ ERROR expected expression, found keyword `in`
}
@@ -0,0 +1,27 @@
error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `<-`
--> $DIR/bad.rs:5:7
|
LL | x <- y;
| ^^ expected one of 8 possible tokens here

error: expected expression, found keyword `in`
--> $DIR/bad.rs:11:5
|
LL | in(foo) { bar };
| ^^ expected expression

error[E0308]: mismatched types
--> $DIR/bad.rs:5:5
|
LL | fn foo() {
| - possibly return type missing here?
LL | let (x, y) = (0, 0);
LL | x <- y;
| ^ expected (), found integer
|
= note: expected type `()`
found type `{integer}`

error: aborting due to 3 previous errors

For more information about this error, try `rustc --explain E0308`.
@@ -5,9 +5,6 @@ LL | for i in in 1..2 {
| ---^^
| |
| help: remove the duplicated `in`
|
= note: if you meant to use emplacement syntax, it is obsolete (for now, anyway)
= note: for more information on the status of emplacement syntax, see <https://github.com/rust-lang/rust/issues/27779#issuecomment-378416911>

error: aborting due to previous error

@@ -1,7 +1,6 @@
fn main() {
let x = -5;
if x<-1 {
//~^ ERROR emplacement syntax is obsolete
if x<-1 { //~ ERROR expected `{`, found `<-`
println!("ok");
}
}
@@ -1,14 +1,10 @@
error: emplacement syntax is obsolete (for now, anyway)
--> $DIR/placement-syntax.rs:3:8
error: expected `{`, found `<-`
--> $DIR/placement-syntax.rs:3:9
|
LL | if x<-1 {
| ^^^^
|
= note: for more information, see <https://github.com/rust-lang/rust/issues/27779#issuecomment-378416911>
help: if you meant to write a comparison against a negative value, add a space in between `<` and `-`
|
LL | if x< -1 {
| ^^^

This comment has been minimized.

Copy link
@estebank

estebank Jul 12, 2019

Contributor

It is a shame that we lost this suggestion...

This comment has been minimized.

Copy link
@varkor

varkor Jul 12, 2019

Author Member

Added #62632 to track this.

| -- ^^ expected `{`
| |
| this `if` statement has a condition, but no block

error: aborting due to previous error

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.