Skip to content

Tweak some ‘expected…’ error messages #21223

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

Merged
merged 1 commit into from
Feb 3, 2015

Conversation

ftxqxd
Copy link
Contributor

@ftxqxd ftxqxd commented Jan 16, 2015

Fixes #21153.

@rust-highfive
Copy link
Contributor

r? @huonw

(rust_highfive has picked a reviewer for you, use r? to override)

true
} else {
false
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not just self.token.is_keyword(kw)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops! Thanks for pointing this out. Fix incoming…

@ftxqxd ftxqxd force-pushed the expected-token-improvements branch 2 times, most recently from 5d6d32a to d4487c8 Compare January 22, 2015 11:40
@huonw
Copy link
Member

huonw commented Feb 1, 2015

Thanks for this; r=me with a rebase (sorry for the delay :( ).

@ftxqxd ftxqxd force-pushed the expected-token-improvements branch from d4487c8 to c0f903b Compare February 2, 2015 02:21
@ftxqxd ftxqxd force-pushed the expected-token-improvements branch from c0f903b to 597b4fa Compare February 2, 2015 02:30
@ftxqxd
Copy link
Contributor Author

ftxqxd commented Feb 2, 2015

@huonw Rebased.

@huonw
Copy link
Member

huonw commented Feb 2, 2015

@bors r+ 597b4fa

@bors
Copy link
Collaborator

bors commented Feb 2, 2015

⌛ Testing commit 597b4fa with merge 5f58d3c...

@bors
Copy link
Collaborator

bors commented Feb 2, 2015

💔 Test failed - auto-win-32-nopt-t

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Collaborator

bors commented Feb 2, 2015

⌛ Testing commit 597b4fa with merge a6079b2...

@bors
Copy link
Collaborator

bors commented Feb 2, 2015

💔 Test failed - auto-mac-64-nopt-t

@alexcrichton
Copy link
Member

@bors: retry

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Feb 2, 2015
@bors
Copy link
Collaborator

bors commented Feb 2, 2015

⌛ Testing commit 597b4fa with merge fe20812...

@bors
Copy link
Collaborator

bors commented Feb 2, 2015

💔 Test failed - auto-win-32-opt

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Collaborator

bors commented Feb 2, 2015

⌛ Testing commit 597b4fa with merge 45fb2eb...

@bors
Copy link
Collaborator

bors commented Feb 2, 2015

💔 Test failed - auto-linux-64-x-android-t

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Collaborator

bors commented Feb 2, 2015

⌛ Testing commit 597b4fa with merge 7263fcb...

@bors
Copy link
Collaborator

bors commented Feb 2, 2015

💔 Test failed - auto-linux-64-x-android-t

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Collaborator

bors commented Feb 3, 2015

⌛ Testing commit 597b4fa with merge 42fdb93...

@bors
Copy link
Collaborator

bors commented Feb 3, 2015

💔 Test failed - auto-mac-64-opt

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Collaborator

bors commented Feb 3, 2015

⌛ Testing commit 597b4fa with merge 4e69c11...

@bors
Copy link
Collaborator

bors commented Feb 3, 2015

💔 Test failed - auto-linux-64-x-android-t

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Collaborator

bors commented Feb 3, 2015

⌛ Testing commit 597b4fa with merge c9e7931...

@bors
Copy link
Collaborator

bors commented Feb 3, 2015

💔 Test failed - auto-mac-32-opt

@alexcrichton
Copy link
Member

@bors: retry

Sorry for the noise :(

@bors bors merged commit 597b4fa into rust-lang:master Feb 3, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"Expected fn, found something" should say "Expected fn or type, found something"
6 participants