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

Fix old docs #41264

Merged
merged 3 commits into from Apr 17, 2017
Merged

Fix old docs #41264

merged 3 commits into from Apr 17, 2017

Conversation

alexeyzab
Copy link
Contributor

@alexeyzab alexeyzab commented Apr 13, 2017

Fixes #41158

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @frewsxcv (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@frewsxcv frewsxcv removed their assignment Apr 13, 2017
@@ -4107,7 +4107,7 @@ impl<'a> Parser<'a> {
self.parse_ty_param_bounds_common(true)
}

// Parse bounds of a type parameter `BOUND + BOUND + BOUND` without trailing `+`.
// Parse bounds of a type parameter `BOUND + BOUND + BOUND`.
Copy link
Contributor

Choose a reason for hiding this comment

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

type parameter -> lifetime parameter

I'd also write "possibly with trailing +" to avoid future questions for sure.

lt_bound := lifetime
ty_bound := [?] [ for<lt_param_defs> ] simple_path
```

Copy link
Contributor

Choose a reason for hiding this comment

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

Could you also remove the bound grammar from ### Closure types and move the bound-list grammar into this paragraph (adjusting it with optional trailing +).

@steveklabnik
Copy link
Member

steveklabnik commented Apr 13, 2017

/cc @rust-lang/compiler or @rust-lang/lang ?

@nikomatsakis
Copy link
Contributor

Seems not wrong to me.

@Mark-Simulacrum Mark-Simulacrum added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 14, 2017
@carols10cents
Copy link
Member

Do I hear an r? @nikomatsakis @steveklabnik @petrochenkov ?

@@ -4066,7 +4066,7 @@ impl<'a> Parser<'a> {
}).emit();
}

// Parse bounds of a type parameter `BOUND + BOUND + BOUND` without trailing `+`.
// Parse bounds of a lifetime parameter `BOUND + BOUND + BOUND`, possibly with trailing `+`.
Copy link
Contributor

Choose a reason for hiding this comment

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

"lifetime parameter" -> "type parameter", otherwise r=me

Copy link
Contributor

Choose a reason for hiding this comment

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

I didn't notice this PR was updated, sorry.

@steveklabnik
Copy link
Member

@bors: r+ rollup

thank you!

@bors
Copy link
Contributor

bors commented Apr 17, 2017

📌 Commit 08a955a has been approved by steveklabnik

@bors
Copy link
Contributor

bors commented Apr 17, 2017

⌛ Testing commit 08a955a with merge 011f240...

bors added a commit that referenced this pull request Apr 17, 2017
@bors
Copy link
Contributor

bors commented Apr 17, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: steveklabnik
Pushing 011f240 to master...

@bors bors merged commit 08a955a into rust-lang:master Apr 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants