Skip to content

annotate-snippet emitter: Deal with multispans from macros, too#64189

Merged
bors merged 1 commit into
rust-lang:masterfrom
phansch:add_macros_support
Sep 6, 2019
Merged

annotate-snippet emitter: Deal with multispans from macros, too#64189
bors merged 1 commit into
rust-lang:masterfrom
phansch:add_macros_support

Conversation

@phansch

@phansch phansch commented Sep 5, 2019

Copy link
Copy Markdown
Contributor

This moves the two methods from the EmitterWriter impl to trait
default methods in the Emitter trait so that they can be re-used by
the AnnotateSnippetEmitterWriter.

r? @estebank

Closes #61810

This moves the two methods from the `EmitterWriter` impl to trait
default methods in the `Emitter` trait so that they can be re-used by
the `AnnotateSnippetEmitterWriter`.

Closes rust-lang#61810
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 5, 2019
@estebank

estebank commented Sep 6, 2019

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Sep 6, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 159d249 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 Sep 6, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 6, 2019
annotate-snippet emitter: Deal with multispans from macros, too

This moves the two methods from the `EmitterWriter` impl to trait
default methods in the `Emitter` trait so that they can be re-used by
the `AnnotateSnippetEmitterWriter`.

r? @estebank

Closes rust-lang#61810
bors added a commit that referenced this pull request Sep 6, 2019
Rollup of 9 pull requests

Successful merges:

 - #64067 (Remove no-prefer-dynamic from valgrind tests)
 - #64078 (compiletest: disable -Aunused for run-pass tests)
 - #64096 (Fix regex replacement in theme detection)
 - #64098 (Ensure edition lints and internal lints are enabled with deny-warnings=false)
 - #64166 (Better way of conditioning the sanitizer builds)
 - #64189 (annotate-snippet emitter: Deal with multispans from macros, too)
 - #64202 (Fixed grammar/style in some error messages)
 - #64206 (annotate-snippet emitter: Update an issue number)
 - #64208 (it's more pythonic to use 'is not None' in python files)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Sep 6, 2019
annotate-snippet emitter: Deal with multispans from macros, too

This moves the two methods from the `EmitterWriter` impl to trait
default methods in the `Emitter` trait so that they can be re-used by
the `AnnotateSnippetEmitterWriter`.

r? @estebank

Closes rust-lang#61810
bors added a commit that referenced this pull request Sep 6, 2019
Rollup of 8 pull requests

Successful merges:

 - #63565 (Rust 2018: NLL migrate mode => hard error)
 - #63969 (Add missing examples for Option type)
 - #64067 (Remove no-prefer-dynamic from valgrind tests)
 - #64166 (Better way of conditioning the sanitizer builds)
 - #64189 (annotate-snippet emitter: Deal with multispans from macros, too)
 - #64202 (Fixed grammar/style in some error messages)
 - #64206 (annotate-snippet emitter: Update an issue number)
 - #64208 (it's more pythonic to use 'is not None' in python files)

Failed merges:

r? @ghost
@bors bors merged commit 159d249 into rust-lang:master Sep 6, 2019
@phansch phansch deleted the add_macros_support branch September 6, 2019 21:15
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.

annotate-snippet emitter: Deal with multispans in macros correctly

4 participants