Skip to content

Remove experimental chalk option - #69247

Merged
bors merged 1 commit into
rust-lang:masterfrom
CAD97:remove-chalk
Mar 3, 2020
Merged

Remove experimental chalk option#69247
bors merged 1 commit into
rust-lang:masterfrom
CAD97:remove-chalk

Conversation

@CAD97

@CAD97CAD97 commented Feb 17, 2020

Copy link
Copy Markdown
Contributor

As suggested by @nikomatsakishere.

The current version of chalk used by the experimental -Zchalk flag is v0.9.0, which is over a year old. Since v0.9.0, chalk has seen a lot of further development, and the intent is to eventually upgrade rustc to use a more recent chalk.

However, it will take a decent chunk of effort to upgrade the current experimental chalk support, and it is currently blocking at least some PRs due to chalk:0.9.0's use of unstable features. So for the interim until the next chalk release and experimental rustc integration, we remove the chalk-specific code from rustc.

@rust-highfive

rust-highfive commented Feb 17, 2020

Copy link
Copy Markdown
Contributor

r? @cramertj

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 17, 2020
@jackh726

jackh726 commented Feb 17, 2020•
edited
Loading

Copy link
Copy Markdown
Member

FWIW, I've gotten (locally) the Chalk-related code updated to the latest Chalk master (with some modifications that'll get PRed soon). It compiles but -Z chalk tests are broken.

@CAD97

CAD97 commented Feb 18, 2020

Copy link
Copy Markdown
ContributorAuthor

Just for good measure, I suppose I should cc @rust-lang/wg-traits

@cramertj

cramertj commented Feb 18, 2020

Copy link
Copy Markdown
Member

r? @nikomatsakis

@bors

bors commented Feb 22, 2020

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #69242) made this pull request unmergeable. Please resolve the merge conflicts.

@JohnCSimonJohnCSimon added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 2, 2020
@nikomatsakis

nikomatsakis commented Mar 2, 2020

Copy link
Copy Markdown
Contributor

OK so I talked to @jackh726 and we agreed that we could go ahead and land this, we'll just "git revert" it and build our replacement. I did a review and it looks good, but it needs a rebase.

@bors delegate=CAD97

@CAD97 if you want to rebase, you can go ahead and make it r=nikomatsakis afterwards.

@bors

bors commented Mar 2, 2020

Copy link
Copy Markdown
Collaborator

✌️ @CAD97 can now approve this pull request

@CAD97

CAD97 commented Mar 2, 2020

Copy link
Copy Markdown
ContributorAuthor

Rebased. If only GitHub actually had a way to show just the conflict resolution of the rebase...

@bors r=nikomatsakis

@bors

bors commented Mar 2, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 02b872ed51d74eb48b07e5dd7b15d51636bf7e76 has been approved by nikomatsakis

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 2, 2020
@CAD97

CAD97 commented Mar 2, 2020•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

@bors r-

Tidy failures crept into the rebase; investigating

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 2, 2020
@CAD97

CAD97 commented Mar 2, 2020

Copy link
Copy Markdown
ContributorAuthor

@bors: r=nikomatsakis

I missed a trailing newline, that's it.

@bors

bors commented Mar 2, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit b3777c9 has been approved by nikomatsakis

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 2, 2020
@CAD97CAD97 mentioned this pull request Mar 3, 2020
Merged
@bors

bors commented Mar 3, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b3777c9 with merge 9381e81...

@bors

bors commented Mar 3, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: nikomatsakis
Pushing 9381e81 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Mar 3, 2020
@bors
bors merged commit 9381e81 into rust-lang:masterMar 3, 2020
This was referenced Mar 3, 2020
Closed
Merged
Merged
@JohnTitorJohnTitor mentioned this pull request Mar 7, 2020
Merged
ehuss added a commit to ehuss/rust that referenced this pull request Mar 13, 2020
@ehuss
tidy: Remove chalk-engine/chalk-macros.
ed0158d
Removed in rust-lang#69247 while this PR was waiting to merge.
@ehussehuss mentioned this pull request Mar 13, 2020
Merged
@jackh726jackh726 mentioned this pull request May 7, 2020
Closed
@CAD97
CAD97 deleted the remove-chalk branch November 6, 2023 19:50
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@nikomatsakisnikomatsakis

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@CAD97@rust-highfive@jackh726@cramertj@bors@nikomatsakis@JohnCSimon