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

Normalize source line and column numbers. #53558

Merged
merged 1 commit into from Aug 22, 2018

Conversation

Projects
None yet
5 participants
@davidtwco
Member

davidtwco commented Aug 21, 2018

Fixes #53547.

r? @eddyb

Normalize source line and column numbers.
This commit adds a normalization for line and column numbers in stderr
files where the line/col is from the source directory rather than
the test itself - thereby removing the need to update tests as
compiler source changes.
@estebank

This comment has been minimized.

Show comment
Hide comment
@estebank

estebank Aug 21, 2018

Contributor

@bors r+ rollup

Contributor

estebank commented Aug 21, 2018

@bors r+ rollup

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Aug 21, 2018

Contributor

📌 Commit 6e24868 has been approved by estebank

Contributor

bors commented Aug 21, 2018

📌 Commit 6e24868 has been approved by estebank

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Aug 22, 2018

Rollup merge of #53558 - davidtwco:issue-53547, r=estebank
Normalize source line and column numbers.

Fixes #53547.

r? @eddyb

bors added a commit that referenced this pull request Aug 22, 2018

Auto merge of #53607 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 10 pull requests

Successful merges:

 - #53418 (Mark some suggestions as MachineApplicable)
 - #53431 (Moved some feature gate ui tests to correct location)
 - #53442 (Update version of rls-data used with save-analysis)
 - #53504 (Set applicability for more suggestions.)
 - #53541 (Fix missing impl trait display as ret type)
 - #53544 (Point at the trait argument when using unboxed closure)
 - #53558 (Normalize source line and column numbers.)
 - #53562 (Lament the invincibility of the Turbofish)
 - #53574 (Suggest direct raw-pointer dereference)
 - #53585 (Remove super old comment on function that parses items)

Failed merges:

 - #53472 (Use FxHash{Map,Set} instead of the default Hash{Map,Set} everywhere in rustc.)
 - #53563 (use String::new() instead of String::from(""), "".to_string(), "".to_owned() or "".into())

r? @ghost

@bors bors merged commit 6e24868 into rust-lang:master Aug 22, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@davidtwco davidtwco deleted the davidtwco:issue-53547 branch Aug 23, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment