Skip to content

Use singular they in the serialize::json docs #21314

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Jan 21, 2015
Merged

Conversation

fenhl
Copy link
Contributor

@fenhl fenhl commented Jan 17, 2015

See this document by @0xabad1dea for the rationale.

@rust-highfive
Copy link
Contributor

r? @pcwalton

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

@fenhl
Copy link
Contributor Author

fenhl commented Jan 17, 2015

I'm not sure why my commit is moving the use self::JsonEvent::*; line around, that wasn't intentional.

@steveklabnik
Copy link
Member

thank you very much! r=me after that change is fixed

@fenhl
Copy link
Contributor Author

fenhl commented Jan 17, 2015

@steveklabnik done

@steveklabnik
Copy link
Member

Thanks so much!

bors added a commit that referenced this pull request Jan 17, 2015
Use singular they in the serialize::json docs

Reviewed-by: steveklabnik
bors referenced this pull request Jan 17, 2015
Brings the rustdoc man page in sync with the options specified in
src/librustdoc/lib.rs. The text was taken verbatim, but I tweaked the
order to be (what I think is) somewhat logical.
@kmcallister
Copy link
Contributor

💖

bors added a commit that referenced this pull request Jan 18, 2015
Use singular they in the serialize::json docs

Reviewed-by: steveklabnik
bors referenced this pull request Jan 18, 2015
It got accidentially reverted in 44440e5.
bors referenced this pull request Jan 18, 2015
bors added a commit that referenced this pull request Jan 18, 2015
Use singular they in the serialize::json docs

Reviewed-by: steveklabnik
@alexcrichton
Copy link
Member

@bors r=steveklbanik 5aa2f9c

@bors
Copy link
Collaborator

bors commented Jan 20, 2015

⌛ Testing commit 5aa2f9c with merge 7e276cd...

@bors
Copy link
Collaborator

bors commented Jan 20, 2015

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

@alexcrichton
Copy link
Member

@bors: retry

@sanxiyn
Copy link
Member

sanxiyn commented Jan 20, 2015

@bors rollup

barosl added a commit to barosl/rust that referenced this pull request Jan 20, 2015
@bors bors merged commit 5aa2f9c into rust-lang:master Jan 21, 2015
@fenhl fenhl deleted the patch-1 branch January 21, 2015 02:05
fenhl added a commit to fenhl/rustc-serialize that referenced this pull request Mar 7, 2015
Same as rust-lang/rust#21314 but for rustc-serialize instead of serialize.
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants