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: Move annotation collection to own impl #61191

Merged
merged 1 commit into from May 29, 2019

Conversation

Projects
None yet
6 participants
@phansch
Copy link
Contributor

commented May 25, 2019

Extracted from work on #59346. This moves the annotation collection to
the FileWithAnnotatedLines impl to allow easier re-use in a separate
EmitterWriter. Even without that new EmitterWriter present, I think it makes
sense to have this as an associated function.

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented May 25, 2019

r? @michaelwoerister

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

@phansch

This comment has been minimized.

Copy link
Contributor Author

commented May 25, 2019

@phansch

This comment was marked as outdated.

Copy link
Contributor Author

commented May 25, 2019

The diff is a bit weird for some reason. This essentially moves preprocess_annotations to the FileWithAnnotatedLines impl and renames it to collect_annotations.

Show resolved Hide resolved src/librustc_errors/emitter.rs Outdated
librustc_errors: Move annotation collection to own impl
Extracted from work on #59346. This moves the annotation collection to
the `FileWithAnnotatedLines` impl to allow re-use in a separate
EmitterWriter.

@phansch phansch force-pushed the phansch:annotate_snippet_refactorings1 branch from 9cee9fa to 96e3fb2 May 28, 2019

@estebank

This comment has been minimized.

Copy link
Contributor

commented May 28, 2019

@bors r+ rollup

@bors

This comment has been minimized.

Copy link
Contributor

commented May 28, 2019

📌 Commit 96e3fb2 has been approved by estebank

Centril added a commit to Centril/rust that referenced this pull request May 29, 2019

Rollup merge of rust-lang#61191 - phansch:annotate_snippet_refactorin…
…gs1, r=estebank

librustc_errors: Move annotation collection to own impl

Extracted from work on rust-lang#59346. This moves the annotation collection to
the `FileWithAnnotatedLines` impl to allow easier re-use in a separate
EmitterWriter. Even without that new EmitterWriter present, I think it makes
sense to have this as an associated function.

Centril added a commit to Centril/rust that referenced this pull request May 29, 2019

Rollup merge of rust-lang#61191 - phansch:annotate_snippet_refactorin…
…gs1, r=estebank

librustc_errors: Move annotation collection to own impl

Extracted from work on rust-lang#59346. This moves the annotation collection to
the `FileWithAnnotatedLines` impl to allow easier re-use in a separate
EmitterWriter. Even without that new EmitterWriter present, I think it makes
sense to have this as an associated function.

bors added a commit that referenced this pull request May 29, 2019

Auto merge of #61305 - Centril:rollup-t39m00m, r=Centril
Rollup of 11 pull requests

Successful merges:

 - #58975 (Implement `iter::Sum` and `iter::Product` for `Option`)
 - #60542 (Add Step::sub_usize)
 - #60555 (Implement nth_back for RChunks(Exact)(Mut))
 - #60766 (Weak::into_raw)
 - #61048 (Feature/nth back chunks)
 - #61191 (librustc_errors: Move annotation collection to own impl)
 - #61235 (Stabilize bufreader_buffer feature)
 - #61249 (Rename Place::local to Place::local_or_deref_local)
 - #61291 (Avoid unneeded bug!() call)
 - #61294 (Rename `TraitOrImpl` to `Assoc` and `trait_or_impl` to `assoc`.)
 - #61297 (Remove LLVM instruction stats and other (obsolete) codegen stats.)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request May 29, 2019

Rollup merge of rust-lang#61191 - phansch:annotate_snippet_refactorin…
…gs1, r=estebank

librustc_errors: Move annotation collection to own impl

Extracted from work on rust-lang#59346. This moves the annotation collection to
the `FileWithAnnotatedLines` impl to allow easier re-use in a separate
EmitterWriter. Even without that new EmitterWriter present, I think it makes
sense to have this as an associated function.

Centril added a commit to Centril/rust that referenced this pull request May 29, 2019

Rollup merge of rust-lang#61191 - phansch:annotate_snippet_refactorin…
…gs1, r=estebank

librustc_errors: Move annotation collection to own impl

Extracted from work on rust-lang#59346. This moves the annotation collection to
the `FileWithAnnotatedLines` impl to allow easier re-use in a separate
EmitterWriter. Even without that new EmitterWriter present, I think it makes
sense to have this as an associated function.

@bors bors merged commit 96e3fb2 into rust-lang:master May 29, 2019

1 check passed

Travis CI - Pull Request Build Passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.