Skip to content

Add documentation for else if to trpl #22515

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 22, 2015

Conversation

adamhjk
Copy link
Contributor

@adamhjk adamhjk commented Feb 19, 2015

Adds an example of else if to the If section of The Rust Programming
Language.

r? @steveklabnik

@rust-highfive
Copy link
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @steveklabnik (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. 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 CONTRIBUTING.md for more information.

@steveklabnik
Copy link
Member

@bors: r+ 56d6dc3 rollup

@steveklabnik
Copy link
Member

Thnak you!

@adamhjk adamhjk force-pushed the add-else-if-to-docs branch 2 times, most recently from 5e60d59 to e85546e Compare February 19, 2015 00:25
Adds an example of `else if` to the If section of The Rust Programming
Language.

r? @steveklabnik
@adamhjk adamhjk force-pushed the add-else-if-to-docs branch from e85546e to cec404a Compare February 19, 2015 00:26
@steveklabnik
Copy link
Member

@bors: r+ cec404a rollup

Manishearth added a commit to Manishearth/rust that referenced this pull request Feb 19, 2015
…eklabnik

 Adds an example of `else if` to the If section of The Rust Programming
Language.

r? @steveklabnik
} else if x == 6 {
println!("x is six!");
} else {
println!("x is not five or six :(");
Copy link
Member

Choose a reason for hiding this comment

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

This should be nor instead of or

Copy link
Member

Choose a reason for hiding this comment

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

I would write "x is not five or six" or "x is five nor six", but the second sounds archaic to me.

Copy link
Member

Choose a reason for hiding this comment

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

FYI https://english.stackexchange.com/questions/10049/usage-of-neither-nor-versus-not-or

I'm not going to spend too much time defending my suggestion here, but I stand by not...nor

Manishearth added a commit to Manishearth/rust that referenced this pull request Feb 21, 2015
…eklabnik

 Adds an example of `else if` to the If section of The Rust Programming
Language.

r? @steveklabnik
@huonw huonw merged commit cec404a into rust-lang:master Feb 22, 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.

5 participants