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

Fix too many anonymized line numbers #5

Merged
merged 1 commit into from Jul 15, 2019

Conversation

@phansch
Copy link
Member

commented Jul 15, 2019

This expands the logic for replacing line numbers with LL so that line
numbers are only replaced, when they are actually provided.

When lineno is None, no LL should be shown in the output.

Fix too many anonymized line numbers
This expands the logic for replacing line numbers with `LL` so that line
numbers are only replaced, when they are actually provided.

When `lineno` is `None`, no `LL` should be shown in the output.
DisplayLine::Source {
lineno: None,
inline_marks: vec![],
line: DisplaySourceLine::Empty,

This comment has been minimized.

Copy link
@phansch

phansch Jul 15, 2019

Author Member

Should the case of DisplaySourceLine::Empty + Some(lineno) also be handled in some way? I didn't see any test cases for it, so I left that out for now.

@zbraniecki zbraniecki merged commit 860899e into rust-lang:master Jul 15, 2019

3 checks passed

Travis CI - Pull Request Build Passed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage increased (+0.09%) to 90.68%
Details

@phansch phansch deleted the phansch:fix_too_many_linenumbers branch Jul 15, 2019

phansch added a commit to phansch/rust that referenced this pull request Jul 25, 2019
librustc_errors: Support ui-testing flag in annotate-snippet emitter
This adds support for the `-Z ui-testing` flag to the new
annotate-snippet diagnostic emitter.

The support for the flag was added to `annotate-snippet-rs` in these PRs:

* rust-lang/annotate-snippets-rs#3
* rust-lang/annotate-snippets-rs#5

Closes rust-lang#61811
Centril added a commit to Centril/rust that referenced this pull request Jul 26, 2019
Rollup merge of rust-lang#62985 - phansch:support_ui_testing_flag, r=…
…estebank

librustc_errors: Support ui-testing flag in annotate-snippet emitter

This adds support for the `-Z ui-testing` flag to the new
annotate-snippet diagnostic emitter.

Support for the flag was added to `annotate-snippet-rs` in these PRs:

* rust-lang/annotate-snippets-rs#3
* rust-lang/annotate-snippets-rs#5

r? @estebank

Closes rust-lang#61811
Centril added a commit to Centril/rust that referenced this pull request Jul 26, 2019
Rollup merge of rust-lang#62985 - phansch:support_ui_testing_flag, r=…
…estebank

librustc_errors: Support ui-testing flag in annotate-snippet emitter

This adds support for the `-Z ui-testing` flag to the new
annotate-snippet diagnostic emitter.

Support for the flag was added to `annotate-snippet-rs` in these PRs:

* rust-lang/annotate-snippets-rs#3
* rust-lang/annotate-snippets-rs#5

r? @estebank

Closes rust-lang#61811
Centril added a commit to Centril/rust that referenced this pull request Jul 26, 2019
Rollup merge of rust-lang#62985 - phansch:support_ui_testing_flag, r=…
…estebank

librustc_errors: Support ui-testing flag in annotate-snippet emitter

This adds support for the `-Z ui-testing` flag to the new
annotate-snippet diagnostic emitter.

Support for the flag was added to `annotate-snippet-rs` in these PRs:

* rust-lang/annotate-snippets-rs#3
* rust-lang/annotate-snippets-rs#5

r? @estebank

Closes rust-lang#61811
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.