Skip to content
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

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

Merged
merged 1 commit into from
Jan 3, 2017
Merged

Conversation

clarfonthey
Copy link
Contributor

@clarfonthey clarfonthey commented Jan 2, 2017

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

@rust-highfive
Copy link
Collaborator

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
Copy link
Member

@steveklabnik steveklabnik left a comment

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!

@@ -74,8 +74,7 @@ The remaining architectures look like:
## QEMU

Lots of the architectures tested here use QEMU in the tests, so it's worth going
over all the crazy capabilities QEMU has and the various flavors in which we use
it!
over all the capabilities QEMU has and the various flavors in which we use it!
Copy link
Member

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
Contributor Author

Choose a reason for hiding this comment

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

also fixed!

# If we don't have a cross-compiler, however, then we need to do some
# convoluted acrobatics to get this to work. Generate all.{c,rs} on the host
# which will be compiled inside QEMU. Do this here because compiling
# syntex_syntax in QEMU would time out basically everywhere.
Copy link
Member

Choose a reason for hiding this comment

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

same here

Copy link
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
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
Member

Thanks!

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Jan 2, 2017

📌 Commit 8ffc3e7 has been approved by GuillaumeGomez

@bors
Copy link
Contributor

bors commented Jan 2, 2017

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

@bors
Copy link
Contributor

bors commented Jan 3, 2017

💔 Test failed - status-travis

@nagisa
Copy link
Member

nagisa commented Jan 3, 2017

Failure is irrelevant.

@steveklabnik
Copy link
Member

@bors: retry

@bors
Copy link
Contributor

bors commented Jan 3, 2017

⌛ 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
Copy link
Contributor

bors commented Jan 3, 2017

☀️ 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