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 leftover AwaitOrigin #63285

Merged
merged 1 commit into from
Aug 6, 2019
Merged

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Aug 5, 2019

This was missed in PR #62293.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 5, 2019
@tesuji
Copy link
Contributor

tesuji commented Aug 5, 2019

What about this?

pub(crate) fn ident_can_begin_expr(name: ast::Name, span: Span, is_raw: bool) -> bool {
let ident_token = Token::new(Ident(name, is_raw), span);
!ident_token.is_reserved_ident() ||
ident_token.is_path_segment_keyword() ||
[
kw::Async,
// FIXME: remove when `await!(..)` syntax is removed
// https://github.com/rust-lang/rust/issues/60610
kw::Await,

@Mark-Simulacrum
Copy link
Member Author

Hm, that seems to be a language change, in particular based on the name would allow for example await.foo to be used, which we might not want? I'll defer to @Centril on whether to remove it.

@Centril
Copy link
Contributor

Centril commented Aug 5, 2019

Thanks! @bors r+ rollup

PS: Is there some tool we can use to shake out dead code that happens to use pub? -- there's probably more in the codebase that could be thrown out that way.


@lzutao I think we could try removing that in a follow up; we'll need a test to demonstrate that await.foo will still not parse.

@bors
Copy link
Contributor

bors commented Aug 5, 2019

📌 Commit fbf93d4 has been approved by Centril

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 5, 2019
Centril added a commit to Centril/rust that referenced this pull request Aug 5, 2019
…Centril

Remove leftover AwaitOrigin

This was missed in PR rust-lang#62293.
Centril added a commit to Centril/rust that referenced this pull request Aug 6, 2019
…Centril

Remove leftover AwaitOrigin

This was missed in PR rust-lang#62293.
Centril added a commit to Centril/rust that referenced this pull request Aug 6, 2019
…Centril

Remove leftover AwaitOrigin

This was missed in PR rust-lang#62293.
Centril added a commit to Centril/rust that referenced this pull request Aug 6, 2019
…Centril

Remove leftover AwaitOrigin

This was missed in PR rust-lang#62293.
bors added a commit that referenced this pull request Aug 6, 2019
Rollup of 14 pull requests

Successful merges:

 - #61457 (Implement DoubleEndedIterator for iter::{StepBy, Peekable, Take})
 - #63017 (Remove special code-path for handing unknown tokens)
 - #63184 (Explaining the reason why validation is performed in to_str of path.rs)
 - #63230 (Make use of possibly uninitialized data [E0381] a hard error)
 - #63260 (fix UB in a test)
 - #63264 (Revert "Rollup merge of #62696 - chocol4te:fix_#62194, r=estebank")
 - #63272 (Some more libsyntax::attr cleanup)
 - #63285 (Remove leftover AwaitOrigin)
 - #63287 (Don't store &Span)
 - #63293 (Clarify align_to's requirements and obligations)
 - #63295 (improve align_offset docs)
 - #63299 (Make qualify consts in_projection use PlaceRef)
 - #63312 (doc: fix broken sentence)
 - #63315 (Fix #63313)

Failed merges:

r? @ghost
@bors bors merged commit fbf93d4 into rust-lang:master Aug 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants