Skip to content

annotate-snippets: update to 0.10 - #119448

Merged
bors merged 2 commits into
rust-lang:masterfrom
klensy:annotate-snippets-0.10
Jan 11, 2024
Merged

annotate-snippets: update to 0.10#119448
bors merged 2 commits into
rust-lang:masterfrom
klensy:annotate-snippets-0.10

Conversation

@klensy

Copy link
Copy Markdown
Contributor

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
Copy Markdown
Collaborator

r? @compiler-errors

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

@rustbotrustbot 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
Copy Markdown
Collaborator

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.

@rustbotrustbot 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
Copy Markdown
Collaborator

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
Copy Markdown
Contributor

r? davidtwco

@davidtwco

Copy link
Copy Markdown
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
Copy Markdown
ContributorAuthor

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
klensyforce-pushed the annotate-snippets-0.10 branch from 695548f to d61ede9CompareJanuary 7, 2024 13:54
}),
footer: vec![],
opt: FormatOptions {
color: true,

@klensyklensyJan 7, 2024

Copy link
Copy Markdown
ContributorAuthor

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
Copy Markdown
ContributorAuthor

@rust-log-analyzer

This comment has been minimized.

@davidtwco

Copy link
Copy Markdown
Member

Ping me once you've got CI passing :)

@davidtwco

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jan 11, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 46cf55a has been approved by davidtwco

It is now in the queue for this repository.

@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 Jan 11, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 11, 2024
…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`.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 11, 2024
…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:masterJan 11, 2024
@rustbotrustbot 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
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
…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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@klensy@rustbot@rust-log-analyzer@compiler-errors@davidtwco@bors