Skip to content

Doc rewording #57693

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 1 commit into from
Feb 13, 2019
Merged

Doc rewording #57693

merged 1 commit into from
Feb 13, 2019

Conversation

king6cong
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Contributor

r? @aidanhs

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 17, 2019
@Centril
Copy link
Contributor

Centril commented Jan 17, 2019

Why this rewording? "reaches" fits with the notion of programs reaching a certain state.

@king6cong
Copy link
Contributor Author

Why this rewording? "reaches" fits with the notion of programs reaching a certain state.

I'm not sure, but I think these are better than reaches an unrecoverable problem

  • encounters an unrecoverable problem
  • reaches an unrecoverable state

@Centril
Copy link
Contributor

Centril commented Jan 25, 2019

Ping from triage @aidanhs, this PR needs your review.

@Centril Centril added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 11, 2019
@Centril
Copy link
Contributor

Centril commented Feb 11, 2019

r? @Centril

reaches an unrecoverable state

This variant sounds good to me; @king6cong mind changing to that?

@rust-highfive rust-highfive assigned Centril and unassigned aidanhs Feb 11, 2019
@Centril
Copy link
Contributor

Centril commented Feb 11, 2019

@bors rollup

r=me with the change above...

@king6cong
Copy link
Contributor Author

@Centril Updated

@Centril
Copy link
Contributor

Centril commented Feb 12, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 12, 2019

📌 Commit b284c8d has been approved by Centril

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 12, 2019
Centril added a commit to Centril/rust that referenced this pull request Feb 13, 2019
Centril added a commit to Centril/rust that referenced this pull request Feb 13, 2019
bors added a commit that referenced this pull request Feb 13, 2019
Rollup of 13 pull requests

Successful merges:

 - #57693 (Doc rewording)
 - #57815 (Speed up the fast path for assert_eq! and assert_ne!)
 - #58034 (Stabilize the time_checked_add feature)
 - #58057 (Stabilize linker-plugin based LTO (aka cross-language LTO))
 - #58137 (Cleanup: rename node_id_to_type(_opt))
 - #58166 (allow shorthand syntax for deprecation reason)
 - #58196 (Add specific feature gate error for const-unstable features)
 - #58200 (fix str mutating through a ptr derived from &self)
 - #58273 (Rename rustc_errors dependency in rust 2018 crates)
 - #58289 (impl iter() for dyn Error)
 - #58387 (Disallow `auto` trait alias syntax)
 - #58404 (use Ubuntu keyserver for CloudABI ports)
 - #58405 (Remove some dead code from libcore)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Feb 13, 2019
bors added a commit that referenced this pull request Feb 13, 2019
Rollup of 12 pull requests

Successful merges:

 - #57693 (Doc rewording)
 - #57815 (Speed up the fast path for assert_eq! and assert_ne!)
 - #58034 (Stabilize the time_checked_add feature)
 - #58057 (Stabilize linker-plugin based LTO (aka cross-language LTO))
 - #58137 (Cleanup: rename node_id_to_type(_opt))
 - #58166 (allow shorthand syntax for deprecation reason)
 - #58200 (fix str mutating through a ptr derived from &self)
 - #58273 (Rename rustc_errors dependency in rust 2018 crates)
 - #58289 (impl iter() for dyn Error)
 - #58387 (Disallow `auto` trait alias syntax)
 - #58404 (use Ubuntu keyserver for CloudABI ports)
 - #58405 (Remove some dead code from libcore)

Failed merges:

r? @ghost
@bors bors merged commit b284c8d into rust-lang:master Feb 13, 2019
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants