Skip to content

Doc rewording - #57693

Merged
bors merged 1 commit into
rust-lang:masterfrom
king6cong:word
Feb 13, 2019
Merged

Doc rewording#57693
bors merged 1 commit into
rust-lang:masterfrom
king6cong:word

Conversation

@king6cong

Copy link
Copy Markdown
Contributor

No description provided.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @aidanhs

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

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

Copy link
Copy Markdown
Contributor

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

@king6cong

Copy link
Copy Markdown
ContributorAuthor

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
Copy Markdown
Contributor

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

@CentrilCentril 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
Copy Markdown
Contributor

r? @Centril

reaches an unrecoverable state

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

@rust-highfiverust-highfive assigned Centril and unassigned aidanhsFeb 11, 2019
@Centril

Copy link
Copy Markdown
Contributor

@bors rollup

r=me with the change above...

@king6cong

Copy link
Copy Markdown
ContributorAuthor

@Centril Updated

@Centril

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Feb 12, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit b284c8d has been approved by Centril

@borsbors 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
@CentrilCentril mentioned this pull request Feb 13, 2019
Centril added a commit to Centril/rust that referenced this pull request Feb 13, 2019
@CentrilCentril mentioned 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
@CentrilCentril mentioned 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:masterFeb 13, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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

@king6cong@rust-highfive@Centril@bors@aidanhs