she -> [they] in Dining Philosophers #25681
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ rollup |
|
📌 Commit f0a9e97 has been approved by |
| @@ -176,7 +178,7 @@ that `new()` function, it would look like this: | |||
| # name: String, | |||
| # } | |||
| fn main() { | |||
| let p1 = Philosopher { name: "Baruch Spinoza".to_string() }; | |||
| let p1 = Philosopher { name: "Judith Butler".to_string() }; | |||
| let p2 = Philosopher { name: "Gilles Deleuze".to_string() }; | |||
| let p3 = Philosopher { name: "Karl Marx".to_string() }; | |||
| let p4 = Philosopher { name: "Friedrich Nietzche".to_string() }; | |||
There was a problem hiding this comment.
Shouldn't this one be changed to "Emma Goldman" as the others ?
There was a problem hiding this comment.
oh my, i did a search-replace, the mis-spelling missed it, thanks
|
@bors: r=nikomatsakis rollup |
|
📌 Commit 8efc294 has been approved by |
|
|
||
| [paper]: http://www.usingcsp.com/cspbook.pdf | ||
|
|
||
| > In ancient times, a wealthy philanthropist endowed a College to accommodate | ||
| > five eminent philosophers. Each philosopher had a room in which she could | ||
| > five eminent philosophers. Each philosopher had a room in which they could | ||
| > engage in her professional activity of thinking; there was also a common |
There was a problem hiding this comment.
s/in her profe/in their profe
steveklabnik
force-pushed
the
gender
branch
2 times, most recently
from
cc7f114 to
65ead71
Compare
Also, when checking for common gendered words elsewhere, I found one 'he', moved to 'they' as well. rust-lang#25640 (comment)
|
@bors: r=nmatsakis rollup |
|
📌 Commit 65ead71 has been approved by |
|
proofreading: it is hard 😓 |
|
I've stayed out of this discussion (and the other threads), but a major 👍 for the care and sensitivity that you and everyone else has put into this 🍰 |
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
May 21, 2015
Also, when checking for common gendered words elsewhere, I found one 'he', moved to 'they' as well. rust-lang#25640 (comment)
| @@ -144,7 +144,7 @@ | |||
| //! // At the end of the method, gadget_owner, gadget1 and gadget2 get | |||
| //! // destroyed. There are now no strong (`Rc<T>`) references to the gadgets. | |||
| //! // Once they get destroyed, the Gadgets get destroyed. This zeroes the | |||
| //! // reference count on Gadget Man, so he gets destroyed as well. | |||
| //! // reference count on Gadget Man, they get destroyed as well. | |||
There was a problem hiding this comment.
I think the 'so' makes the causal relation clearer.
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
May 22, 2015
Also, when checking for common gendered words elsewhere, I found one 'he', moved to 'they' as well. rust-lang#25640 (comment)
oli-obk
pushed a commit
to oli-obk/rust
that referenced
this pull request
May 23, 2015
Also, when checking for common gendered words elsewhere, I found one 'he', moved to 'they' as well. rust-lang#25640 (comment)
oli-obk
pushed a commit
to oli-obk/rust
that referenced
this pull request
May 23, 2015
Also, when checking for common gendered words elsewhere, I found one 'he', moved to 'they' as well. rust-lang#25640 (comment)
oli-obk
pushed a commit
to oli-obk/rust
that referenced
this pull request
May 23, 2015
Also, when checking for common gendered words elsewhere, I found one 'he', moved to 'they' as well. rust-lang#25640 (comment)
oli-obk
pushed a commit
to oli-obk/rust
that referenced
this pull request
May 23, 2015
Also, when checking for common gendered words elsewhere, I found one 'he', moved to 'they' as well. rust-lang#25640 (comment)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also, when checking for common gendered words elsewhere, I found one 'he', moved to 'they' as well.
#25640 (comment)