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.

Sign up for GitHub

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

Jump to bottom

Rust Book: Generics: Resolving ambiguities #39748

Merged
merged 1 commit into from
Feb 20, 2017
Merged

Rust Book: Generics: Resolving ambiguities #39748

merged 1 commit into from
Feb 20, 2017

Conversation

Rufflewind
Copy link
Contributor

  • Add a small section to generics.md to explain how ambiguities in type inference can be resolved using the ::<> syntax.
  • Add links from syntax-index.md and iterators.md.
  • Minor edits to iterators.md and structs.md.

@rust-highfive
Copy link
Collaborator

r? @steveklabnik

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

@steveklabnik
Copy link
Member

Hey @Rufflewind , thanks for this! I am not going to have time to review this PR until Monday; sorry about that! I also wanted to make you aware of #39633; if it lands, your PR may have to be rebased, but luckily, the only changes are moving the files into a src directory, so it shouldn't be too tough.

Maybe someone else will be able to review in the meantime, but if not, you'll hear from me in a few days 😄

@Rufflewind
Copy link
Contributor Author

Alright, thanks for the heads up!

@bors
Copy link
Contributor

bors commented Feb 15, 2017

☔ The latest upstream changes (presumably #39633) made this pull request unmergeable. Please resolve the merge conflicts.

steveklabnik
steveklabnik suggested changes Feb 20, 2017
View reviewed changes
Copy link
Member

@steveklabnik steveklabnik left a comment

Choose a reason for hiding this comment

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

Hey there! I'm so sorry that this took me a lot longer than expected. I have one issue here about the tests failing, but other than that, this looks good to go, thank you!

src/doc/book/src/generics.md Outdated
Sometimes though, the compiler needs a little help. For example, had we
omitted the last line, we would get a compile error:

```rust
Copy link
Member

Choose a reason for hiding this comment

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

https://travis-ci.org/rust-lang/rust/jobs/201806410#L2417

this line needs an ,ignore after the rust.

@Rufflewind
Rust Book: Generics: Resolving ambiguities
cc00059 
- Add a small section to generics.md to explain how ambiguities in type
  inference can be resolved using the ::<> syntax.
- Add links from syntax-index.md and iterators.md.
- Minor edits to iterators.md and structs.md.
@Rufflewind
Copy link
Contributor Author

Updated.

@steveklabnik
Copy link
Member

@bors: r+ rollup

thanks! Sorry again about the delay.

@bors
Copy link
Contributor

bors commented Feb 20, 2017

📌 Commit cc00059 has been approved by steveklabnik

@bors
Copy link
Contributor

bors commented Feb 20, 2017

⌛ Testing commit cc00059 with merge 5b7c556...

bors added a commit that referenced this pull request Feb 20, 2017
@bors
Auto merge of #39748 - Rufflewind:master, r=steveklabnik
5b7c556 
Rust Book: Generics: Resolving ambiguities

- Add a small section to generics.md to explain how ambiguities in type inference can be resolved using the `::<>` syntax.
- Add links from syntax-index.md and iterators.md.
- Minor edits to iterators.md and structs.md.
@bors
Copy link
Contributor

bors commented Feb 20, 2017

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

@bors bors merged commit cc00059 into rust-lang:master Feb 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@steveklabnik steveklabnik steveklabnik approved these changes

Assignees

@steveklabnik steveklabnik

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Rufflewind @rust-highfive @steveklabnik @bors