-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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
annotate-snippet emitter: Deal with multispans from macros, too #64189
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
added
the
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Sep 5, 2019
estebank
approved these changes
Sep 6, 2019
@bors r+ |
📌 Commit 159d249 has been approved by |
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
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This moves the two methods from the
EmitterWriter
impl to traitdefault methods in the
Emitter
trait so that they can be re-used bythe
AnnotateSnippetEmitterWriter
.r? @estebank
Closes #61810