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.

Sign up for GitHub

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

Jump to bottom

annotate-snippets: update to 0.10 #119448

Merged
merged 2 commits into from
Jan 11, 2024
Merged

annotate-snippets: update to 0.10 #119448

merged 2 commits into from
Jan 11, 2024

Conversation

klensy
Copy link
Contributor

@klensy klensy commented Dec 30, 2023

Ports annotate-snippets to 0.10, temporary dupes versions; other crates left that depends on 0.9 is ui_test and rustfmt.

@rustbot
Copy link
Collaborator

rustbot commented Dec 30, 2023

r? @compiler-errors

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 30, 2023
@rustbot
Copy link
Collaborator

rustbot commented Dec 30, 2023

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Dec 30, 2023
@rustbot
Copy link
Collaborator

rustbot commented Dec 30, 2023

The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging.

cc @davidtwco, @wesleywiser

@compiler-errors
Copy link
Member

r? davidtwco

@rustbot rustbot assigned davidtwco and unassigned compiler-errors Jan 4, 2024
@davidtwco
Copy link
Member

anstyle seems fine to introduce as a transitive dependency. Is there a reason you couldn't just bump rustfmt's use here too?

@klensy
Copy link
Contributor Author

klensy commented Jan 5, 2024

anstyle seems fine to introduce as a transitive dependency. Is there a reason you couldn't just bump rustfmt's use here too?

I'll send pr to rustfmt repo directly, so less moving parts when syncing with rustfmt.

klensy
klensy commented Jan 7, 2024
View reviewed changes
compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs
@@ -190,11 +189,6 @@ impl AnnotateSnippetEmitter {
annotation_type: annotation_type_for_level(*level),
}),
footer: vec![],
opt: FormatOptions {
color: true,
Copy link
Contributor Author

@klensy klensy Jan 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was color: true, so styled() now?

No test failed with that change, through.

@klensy
Copy link
Contributor Author

klensy commented Jan 7, 2024

Pushed fix plus updated to 0.10.1 (https://github.com/rust-lang/annotate-snippets-rs/blob/0.10.1/CHANGELOG.md#0101---2024-01-04)

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@davidtwco
Copy link
Member

Ping me once you've got CI passing :)

@klensy klensy mentioned this pull request Jan 10, 2024
Open
@davidtwco
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jan 11, 2024

📌 Commit 46cf55a has been approved by davidtwco

It is now in the queue for this repository.

@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 Jan 11, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 11, 2024
@matthiaskrgr
Rollup merge of rust-lang#119448 - klensy:annotate-snippets-0.10, r=d…
762f101 
…avidtwco

annotate-snippets: update to 0.10

Ports `annotate-snippets` to 0.10, temporary dupes versions; other crates left that depends on 0.9 is `ui_test` and `rustfmt`.
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 11, 2024
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 11, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 11, 2024
@bors
Auto merge of rust-lang#119864 - matthiaskrgr:rollup-mc2qz13, r=matth…
62d7ed4 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#119448 (annotate-snippets: update to 0.10)
 - rust-lang#119813 (Silence some follow-up errors [2/x])
 - rust-lang#119836 (chore: remove unnecessary blank line)
 - rust-lang#119841 (Remove `DiagnosticBuilder::buffer`)
 - rust-lang#119842 (coverage: Add enums to accommodate other kinds of coverage mappings)
 - rust-lang#119845 (rint: further doc tweaks)
 - rust-lang#119852 (give const-err4 a more descriptive name)
 - rust-lang#119853 (rustfmt.toml: don't ignore just any tests path, only root one)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit fe97e93 into rust-lang:master Jan 11, 2024
11 checks passed
@rustbot rustbot added this to the 1.77.0 milestone Jan 11, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 11, 2024
@rust-timer
Unrolled build for rust-lang#119448
62aaf1d 
Rollup merge of rust-lang#119448 - klensy:annotate-snippets-0.10, r=davidtwco

annotate-snippets: update to 0.10

Ports `annotate-snippets` to 0.10, temporary dupes versions; other crates left that depends on 0.9 is `ui_test` and `rustfmt`.
flip1995 pushed a commit to flip1995/rust that referenced this pull request Jan 25, 2024
@bors
Auto merge of rust-lang#119864 - matthiaskrgr:rollup-mc2qz13, r=matth…
6baa129 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#119448 (annotate-snippets: update to 0.10)
 - rust-lang#119813 (Silence some follow-up errors [2/x])
 - rust-lang#119836 (chore: remove unnecessary blank line)
 - rust-lang#119841 (Remove `DiagnosticBuilder::buffer`)
 - rust-lang#119842 (coverage: Add enums to accommodate other kinds of coverage mappings)
 - rust-lang#119845 (rint: further doc tweaks)
 - rust-lang#119852 (give const-err4 a more descriptive name)
 - rust-lang#119853 (rustfmt.toml: don't ignore just any tests path, only root one)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidtwco davidtwco davidtwco approved these changes

Assignees

@davidtwco davidtwco

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.77.0
Development

Successfully merging this pull request may close these issues.
6 participants
@klensy @rustbot @rust-log-analyzer @compiler-errors @davidtwco @bors