Skip to content

librustc_errors: Extract sugg/subst handling into method - #64058

Merged
bors merged 1 commit into
rust-lang:masterfrom
phansch:refactor_out_method
Sep 3, 2019
Merged

librustc_errors: Extract sugg/subst handling into method#64058
bors merged 1 commit into
rust-lang:masterfrom
phansch:refactor_out_method

Conversation

@phansch

@phanschphansch commented Sep 1, 2019

Copy link
Copy Markdown
Contributor

An initial refactoring before working on #61809.

This moves the whole block into a method so that it can be reused in the
annotate-snippet emitter. The method is already used in the new emitter, but
there's no UI tests with suggestions included in this PR.

A first look at some UI tests with suggestions showed that there's some
more work to do in annotate-snippet-rs before the new output is closer to the
current one, so I opted to do that in a second step.

r? @estebank

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 1, 2019
@rust-highfive

Copy link
Copy Markdown
Contributor

The job x86_64-gnu-llvm-6.0 of your PR failed (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-09-01T10:38:58.4577115Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-09-01T10:38:58.4777073Z ##[command]git config gc.auto 0
2019-09-01T10:38:58.4863700Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-09-01T10:38:58.4940699Z ##[command]git config --get-all http.proxy
2019-09-01T10:38:58.5070235Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/64058/merge:refs/remotes/pull/64058/merge
---
2019-09-01T10:45:47.3218053Z Compiling serde_json v1.0.40
2019-09-01T10:45:49.1574047Z Compiling tidy v0.1.0 (/checkout/src/tools/tidy)
2019-09-01T10:46:00.1333529Z Finished release [optimized] target(s) in 1m 29s
2019-09-01T10:46:00.1409836Z tidy check
2019-09-01T10:46:00.4952235Z tidy error: /checkout/src/librustc_errors/emitter.rs:205: line longer than 100 chars
2019-09-01T10:46:02.0958885Z some tidy checks failed
2019-09-01T10:46:02.8902564Z 2019-09-01T10:46:02.8902564Z 2019-09-01T10:46:02.8903667Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor"
2019-09-01T10:46:02.8905034Z 2019-09-01T10:46:02.8905139Z 2019-09-01T10:46:02.8905336Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
2019-09-01T10:46:02.8905696Z Build completed unsuccessfully in 0:01:33
2019-09-01T10:46:02.8905696Z Build completed unsuccessfully in 0:01:33
2019-09-01T10:46:02.8905889Z == clock drift check ==
2019-09-01T10:46:02.8905966Z local time: Sun Sep 1 10:46:02 UTC 2019
2019-09-01T10:46:02.8906042Z network time: Sun, 01 Sep 2019 10:46:02 GMT
2019-09-01T10:46:02.8906089Z == end clock drift check ==
2019-09-01T10:46:03.6935872Z ##[error]Bash exited with code '1'.
2019-09-01T10:46:03.6967378Z ##[section]Starting: Checkout
2019-09-01T10:46:03.6968914Z ==============================================================================
2019-09-01T10:46:03.6968984Z Task : Get sources
2019-09-01T10:46:03.6969031Z Description : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

An initial refactoring before working on rust-lang#61809.
This moves the whole block into a method so that it can be reused in the
annotate-snippet output. It's already used in the new emitter, but
there's no UI tests with suggestions included in this PR.
A first look at some UI tests with suggestions showed that there's some
more work to do in [annotate-snippet-rs][annotate-snippet-rs] before the
new output is closer to the current one.
@estebank

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Sep 1, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 84ccbe2 has been approved by estebank

@borsbors 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 1, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 1, 2019
…bank
librustc_errors: Extract sugg/subst handling into method
An initial refactoring before working on rust-lang#61809.
This moves the whole block into a method so that it can be reused in the
annotate-snippet emitter. The method is already used in the new emitter, but
there's no UI tests with suggestions included in this PR.
A first look at some UI tests with suggestions showed that there's some
more work to do in [annotate-snippet-rs][annotate-snippet-rs] before the new output is closer to the
current one, so I opted to do that in a second step.
r? @estebank
[annotate-snippet-rs]: https://github.com/rust-lang/annotate-snippets-rs
@CentrilCentril mentioned this pull request Sep 1, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 3, 2019
…bank
librustc_errors: Extract sugg/subst handling into method
An initial refactoring before working on rust-lang#61809.
This moves the whole block into a method so that it can be reused in the
annotate-snippet emitter. The method is already used in the new emitter, but
there's no UI tests with suggestions included in this PR.
A first look at some UI tests with suggestions showed that there's some
more work to do in [annotate-snippet-rs][annotate-snippet-rs] before the new output is closer to the
current one, so I opted to do that in a second step.
r? @estebank
[annotate-snippet-rs]: https://github.com/rust-lang/annotate-snippets-rs
@CentrilCentril mentioned this pull request Sep 3, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 3, 2019
…bank
librustc_errors: Extract sugg/subst handling into method
An initial refactoring before working on rust-lang#61809.
This moves the whole block into a method so that it can be reused in the
annotate-snippet emitter. The method is already used in the new emitter, but
there's no UI tests with suggestions included in this PR.
A first look at some UI tests with suggestions showed that there's some
more work to do in [annotate-snippet-rs][annotate-snippet-rs] before the new output is closer to the
current one, so I opted to do that in a second step.
r? @estebank
[annotate-snippet-rs]: https://github.com/rust-lang/annotate-snippets-rs
@CentrilCentril mentioned this pull request Sep 3, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 3, 2019
…bank
librustc_errors: Extract sugg/subst handling into method
An initial refactoring before working on rust-lang#61809.
This moves the whole block into a method so that it can be reused in the
annotate-snippet emitter. The method is already used in the new emitter, but
there's no UI tests with suggestions included in this PR.
A first look at some UI tests with suggestions showed that there's some
more work to do in [annotate-snippet-rs][annotate-snippet-rs] before the new output is closer to the
current one, so I opted to do that in a second step.
r? @estebank
[annotate-snippet-rs]: https://github.com/rust-lang/annotate-snippets-rs
@CentrilCentril mentioned this pull request Sep 3, 2019
bors added a commit that referenced this pull request Sep 3, 2019
Rollup of 5 pull requests
Successful merges:
- #64049 (Emit a single error on if expr with expectation and no else clause)
- #64056 (Account for arbitrary self types in E0599)
- #64058 (librustc_errors: Extract sugg/subst handling into method)
- #64071 (use just one name when parameters and fields are the same)
- #64104 (Emit error on intrinsic to fn ptr casts)
Failed merges:
r? @ghost
@bors
bors merged commit 84ccbe2 into rust-lang:masterSep 3, 2019
@phansch
phansch deleted the refactor_out_method branch September 3, 2019 19:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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.

4 participants

@phansch@rust-highfive@estebank@bors