Skip to content

Reword 'stupid' and 'crazy' in docs.#38782

Merged
bors merged 1 commit into
rust-lang:masterfrom
clarfonthey:stupid
Jan 3, 2017
Merged

Reword 'stupid' and 'crazy' in docs.#38782
bors merged 1 commit into
rust-lang:masterfrom
clarfonthey:stupid

Conversation

@clarfonthey

@clarfonthey clarfonthey commented Jan 2, 2017

Copy link
Copy Markdown
Contributor

These terms are not very descriptive and are better reworded as something else.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @steveklabnik

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

@clarfonthey clarfonthey changed the title Replace 'stupid' with 'nonsensical' in nomicon. Reword 'stupid' and 'crazy' in docs. Jan 2, 2017

@steveklabnik steveklabnik left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Happy to r+ this but the vendored changes need backed out, thanks!

Comment thread src/vendor/libc/ci/README.md Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this change can't work; this is a vendored copy of the https://github.com/rust-lang/libc crate, and would need to be fixed there, that's why CI is failing.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

also fixed!

Comment thread src/vendor/libc/ci/run.sh Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

same here

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

fixed!

@clarfonthey

Copy link
Copy Markdown
Contributor Author

Ah, I tried to avoid searching through the submodules and I guess that I missed some. Removed the vendor changes and rebased.

@GuillaumeGomez

Copy link
Copy Markdown
Member

Thanks!

@bors: r+ rollup

@bors

bors commented Jan 2, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 8ffc3e7 has been approved by GuillaumeGomez

@bors

bors commented Jan 2, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 8ffc3e7 with merge 2bb0dcc...

@bors

bors commented Jan 3, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@nagisa

nagisa commented Jan 3, 2017

Copy link
Copy Markdown
Member

Failure is irrelevant.

@steveklabnik

Copy link
Copy Markdown
Contributor

@bors: retry

@bors

bors commented Jan 3, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 8ffc3e7 with merge 1659d65...

bors added a commit that referenced this pull request Jan 3, 2017
Reword 'stupid' and 'crazy' in docs.

These terms are not very descriptive and are better reworded as something else.
@bors

bors commented Jan 3, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: GuillaumeGomez
Pushing 1659d65 to master...

@bors bors merged commit 8ffc3e7 into rust-lang:master Jan 3, 2017
@clarfonthey clarfonthey deleted the stupid branch January 3, 2017 04:48
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.

6 participants