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

librustc_errors: Rename AnnotateRs -> AnnotateSnippet #61556

Merged
merged 1 commit into from
Jun 6, 2019

Conversation

phansch
Copy link
Member

@phansch phansch commented Jun 5, 2019

The proper name of the library is annotate-snippet, not annotate-rs,
this PR should get rid of any confusing AnnotateRs names.

  1. Renames annotate_rs_emitter.rs to
    annotate_snippet_emitter_writer.rs so that the difference between the
    Emitter trait and the implementers is more clear.
  2. Renames AnnotateRsEmitterWriter to AnnotateSnippetEmitterWriter
  3. Renames HumanReadableErrorType::AnnotateRs to HumanReadableErrorType::AnnotateSnippet

@rust-highfive
Copy link
Collaborator

r? @estebank

(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 Jun 5, 2019
@rust-highfive

This comment has been minimized.

The proper name of the library is `annotate-snippet`, not `annotate-rs`,
this commit should get rid of any confusing `AnnotateRs` names.

1. Renames `annotate_rs_emitter.rs` to
   `annotate_snippet_emitter_writer.rs` so that the difference between the
   `Emitter` trait and the implementers is more clear.
2. Renames `AnnotateRsEmitterWriter` to `AnnotateSnippetEmitterWriter`
3. Renames `HumanReadableErrorType::AnnotateRs` to `HumanReadableErrorType::AnnotateSnippet`
@estebank
Copy link
Contributor

estebank commented Jun 5, 2019

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 5, 2019

📌 Commit df076b2 has been approved by estebank

@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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 5, 2019
Centril added a commit to Centril/rust that referenced this pull request Jun 6, 2019
librustc_errors: Rename AnnotateRs -> AnnotateSnippet

The proper name of the library is `annotate-snippet`, not `annotate-rs`,
this PR should get rid of any confusing `AnnotateRs` names.

1. Renames `annotate_rs_emitter.rs` to
   `annotate_snippet_emitter_writer.rs` so that the difference between the
   `Emitter` trait and the implementers is more clear.
2. Renames `AnnotateRsEmitterWriter` to `AnnotateSnippetEmitterWriter`
3. Renames `HumanReadableErrorType::AnnotateRs` to `HumanReadableErrorType::AnnotateSnippet`
bors added a commit that referenced this pull request Jun 6, 2019
Rollup of 4 pull requests

Successful merges:

 - #61556 (librustc_errors: Rename AnnotateRs -> AnnotateSnippet)
 - #61557 (rustbuild: Include `rustfmt` in deduplicated dependencies)
 - #61571 (Escape HashMap with backticks in needs_drop docs)
 - #61582 (submodules: update clippy from 20da8f4 to 71be6f6)

Failed merges:

r? @ghost
@bors bors merged commit df076b2 into rust-lang:master Jun 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.

4 participants