she -> [they] in Dining Philosophers #25681

steveklabnik · 2015-05-21T15:12:51Z

Also, when checking for common gendered words elsewhere, I found one 'he', moved to 'they' as well.

#25640 (comment)

rust-highfive · 2015-05-21T15:13:02Z

r? @alexcrichton

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

nikomatsakis · 2015-05-21T15:22:51Z

@bors r+ rollup

bors · 2015-05-21T15:22:52Z

📌 Commit f0a9e97 has been approved by nikomatsakis

elinorbgr · 2015-05-21T15:38:26Z

src/doc/trpl/dining-philosophers.md

Shouldn't this one be changed to "Emma Goldman" as the others ?

oh my, i did a search-replace, the mis-spelling missed it, thanks

steveklabnik · 2015-05-21T15:41:52Z

@bors: r=nikomatsakis rollup

bors · 2015-05-21T15:41:53Z

📌 Commit 8efc294 has been approved by nikomatsakis

killercup · 2015-05-21T15:51:08Z

src/doc/trpl/dining-philosophers.md

s/in her profe/in their profe

Also, when checking for common gendered words elsewhere, I found one 'he', moved to 'they' as well. rust-lang#25640 (comment)

steveklabnik · 2015-05-21T15:53:46Z

@bors: r=nmatsakis rollup

bors · 2015-05-21T15:53:46Z

📌 Commit 65ead71 has been approved by nmatsakis

steveklabnik · 2015-05-21T15:53:55Z

proofreading: it is hard 😓

andrew-d · 2015-05-21T16:37:05Z

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 🍰

Also, when checking for common gendered words elsewhere, I found one 'he', moved to 'they' as well. rust-lang#25640 (comment)

crazymykl · 2015-05-22T00:23:57Z

src/liballoc/rc.rs

I think the 'so' makes the causal relation clearer.

Also, when checking for common gendered words elsewhere, I found one 'he', moved to 'they' as well. rust-lang#25640 (comment)

- Successful merges: #25681, #25687, #25695, #25697, #25702, #25703, #25709, #25710, #25714, #25715, #25716, #25722 - Failed merges:

rust-highfive assigned alexcrichton May 21, 2015

steveklabnik force-pushed the gender branch from 4ef8d82 to f0a9e97 Compare May 21, 2015 15:22

elinorbgr reviewed May 21, 2015
View reviewed changes

steveklabnik force-pushed the gender branch from f0a9e97 to 8efc294 Compare May 21, 2015 15:41

killercup reviewed May 21, 2015
View reviewed changes

src/doc/trpl/dining-philosophers.md Outdated

Copy link

Contributor

killercup May 21, 2015

Choose a reason for hiding this comment

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

s/in her profe/in their profe

steveklabnik force-pushed the gender branch 2 times, most recently from cc7f114 to 65ead71 Compare May 21, 2015 15:53

she -> they in Dining Philosophers

65ead71

Also, when checking for common gendered words elsewhere, I found one 'he', moved to 'they' as well. rust-lang#25640 (comment)

Manishearth mentioned this pull request May 21, 2015

Rollup of 2 pull requests #25686

Closed

crazymykl reviewed May 22, 2015
View reviewed changes

src/liballoc/rc.rs

Copy link

crazymykl May 22, 2015

Choose a reason for hiding this comment

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

I think the 'so' makes the causal relation clearer.

Manishearth mentioned this pull request May 22, 2015

Rollup of 7 pull requests #25711

Closed

oli-obk pushed a commit to oli-obk/rust that referenced this pull request May 23, 2015

Rollup merge of rust-lang#25681 - steveklabnik:gender, r=nmatsakis

1f08abf

Also, when checking for common gendered words elsewhere, I found one 'he', moved to 'they' as well. rust-lang#25640 (comment)

oli-obk mentioned this pull request May 23, 2015

Rollup of 17 pull requests #25731

Closed

oli-obk pushed a commit to oli-obk/rust that referenced this pull request May 23, 2015

Rollup merge of rust-lang#25681 - steveklabnik:gender, r=nmatsakis

8b50ccf

Also, when checking for common gendered words elsewhere, I found one 'he', moved to 'they' as well. rust-lang#25640 (comment)

oli-obk mentioned this pull request May 23, 2015

Rollup of 13 pull requests #25734

Closed

oli-obk pushed a commit to oli-obk/rust that referenced this pull request May 23, 2015

Rollup merge of rust-lang#25681 - steveklabnik:gender, r=nmatsakis

0be443c

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

Rollup merge of rust-lang#25681 - steveklabnik:gender, r=nmatsakis

0c74a73

Also, when checking for common gendered words elsewhere, I found one 'he', moved to 'they' as well. rust-lang#25640 (comment)

oli-obk mentioned this pull request May 23, 2015

Rollup of 12 pull requests #25735

Merged

bors added a commit that referenced this pull request May 23, 2015

Auto merge of #25735 - oli-obk:rollup, r=steveklabnik

a33b808

- Successful merges: #25681, #25687, #25695, #25697, #25702, #25703, #25709, #25710, #25714, #25715, #25716, #25722 - Failed merges:

bors merged commit 65ead71 into rust-lang:master May 23, 2015

she -> [they] in Dining Philosophers #25681

she -> [they] in Dining Philosophers #25681

Uh oh!

Conversation

steveklabnik commented May 21, 2015

Uh oh!

rust-highfive commented May 21, 2015

Uh oh!

nikomatsakis commented May 21, 2015

Uh oh!

bors commented May 21, 2015

Uh oh!

elinorbgr May 21, 2015

Choose a reason for hiding this comment

Uh oh!

steveklabnik May 21, 2015

Choose a reason for hiding this comment

Uh oh!

steveklabnik commented May 21, 2015

Uh oh!

bors commented May 21, 2015

Uh oh!

killercup May 21, 2015

Choose a reason for hiding this comment

Uh oh!

steveklabnik commented May 21, 2015

Uh oh!

bors commented May 21, 2015

Uh oh!

steveklabnik commented May 21, 2015

Uh oh!

andrew-d commented May 21, 2015

Uh oh!

crazymykl May 22, 2015

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants