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

chore: Update to toml v0.6, toml_edit v0.18 #11618

Merged
merged 1 commit into from
Feb 12, 2023
Merged

chore: Update to toml v0.6, toml_edit v0.18 #11618

merged 1 commit into from
Feb 12, 2023

Conversation

epage
Copy link
Contributor

@epage epage commented Jan 23, 2023

toml replaces toml_edit::easy, using toml_edit as its parser.

@epage
chore: Update to toml v0.6, toml_edit v0.18
6007f05 
`toml` replaces `toml_edit::easy`, using `toml_edit` as its parser.
@rustbot
Copy link
Collaborator

rustbot commented Jan 23, 2023

r? @ehuss

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

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 23, 2023
epage
epage commented Jan 23, 2023
View reviewed changes
Cargo.toml Outdated Show resolved Hide resolved
@epage epage force-pushed the toml branch 4 times, most recently from 326b841 to 8011ecc Compare January 24, 2023 01:30
@epage
Copy link
Contributor Author

epage commented Jan 24, 2023

Currently blocked on #11619

@epage epage force-pushed the toml branch 3 times, most recently from 8b1c139 to 3e4bf83 Compare January 27, 2023 17:49
@epage epage marked this pull request as ready for review February 7, 2023 16:29
@rustbot rustbot added A-configuration Area: cargo config files and env vars A-lockfile Area: Cargo.lock issues A-manifest Area: Cargo.toml issues A-testing-cargo-itself Area: cargo's tests A-workspaces Area: workspaces labels Feb 9, 2023
@ehuss
Copy link
Contributor

ehuss commented Feb 11, 2023

Thanks!

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 11, 2023

📌 Commit 48a61a3 has been approved by ehuss

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 Feb 11, 2023
@bors
Copy link
Collaborator

bors commented Feb 11, 2023

⌛ Testing commit 48a61a3 with merge d20de4c...

bors added a commit that referenced this pull request Feb 11, 2023
@bors
Auto merge of #11618 - epage:toml, r=ehuss
d20de4c 
chore: Update to toml v0.6, toml_edit v0.18

`toml` replaces `toml_edit::easy`, using `toml_edit` as its parser.
@bors
Copy link
Collaborator

bors commented Feb 11, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 11, 2023
@epage
Copy link
Contributor Author

epage commented Feb 12, 2023

@bors retry

@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 Feb 12, 2023
@ehuss
Copy link
Contributor

ehuss commented Feb 12, 2023

After pushing, retry won't work since the commit hash has changed. Bors requires a re-approval after a push.

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 12, 2023

📌 Commit 6007f05 has been approved by ehuss

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Feb 12, 2023

⌛ Testing commit 6007f05 with merge 39c13e6...

@bors
Copy link
Collaborator

bors commented Feb 12, 2023

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 39c13e6 to master...

@bors bors merged commit 39c13e6 into rust-lang:master Feb 12, 2023
@weihanglo weihanglo mentioned this pull request Feb 13, 2023
Merged
weihanglo added a commit to weihanglo/rust that referenced this pull request Feb 13, 2023
@weihanglo
Update cargo
4c4b4c0 
10 commits in 82c3bb79e3a19a5164e33819ef81bfc2c984bc56..39c13e67a5962466cc7253d41bc1099bbcb224c3
2023-02-04 22:52:16 +0000 to 2023-02-12 02:01:08 +0000

- chore: Update to toml v0.6, toml_edit v0.18 (rust-lang/cargo#11618)
- doc: more doc comments and intra-doc links (rust-lang/cargo#11703)
- Deny warnings in CI, not locally (rust-lang/cargo#11699)
- add comment to lto.rs (rust-lang/cargo#11701)
- Re-export cargo_new::NewProjectKind as public (rust-lang/cargo#11700)
- Add '-C' flag for changing current dir before build (rust-lang/cargo#10952)
- `-Zrustdoc-scrape-example` must fail with bad build script (rust-lang/cargo#11694)
- Update CHANGELOG for 1.68 backports (rust-lang/cargo#11690)
- Update 1password to the version 2 CLI (rust-lang/cargo#11692)
- chore: autolabel more for `A-*` (rust-lang/cargo#11679)
@epage epage deleted the toml branch February 13, 2023 15:14
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 14, 2023
@bors
Auto merge of rust-lang#107993 - weihanglo:update-cargo, r=weihanglo
c3c6d73 
Update cargo

10 commits in 82c3bb79e3a19a5164e33819ef81bfc2c984bc56..39c13e67a5962466cc7253d41bc1099bbcb224c3 2023-02-04 22:52:16 +0000 to 2023-02-12 02:01:08 +0000

- chore: Update to toml v0.6, toml_edit v0.18 (rust-lang/cargo#11618)
- doc: more doc comments and intra-doc links (rust-lang/cargo#11703)
- Deny warnings in CI, not locally (rust-lang/cargo#11699)
- add comment to lto.rs (rust-lang/cargo#11701)
- Re-export cargo_new::NewProjectKind as public (rust-lang/cargo#11700)
- Add '-C' flag for changing current dir before build (rust-lang/cargo#10952)
- `-Zrustdoc-scrape-example` must fail with bad build script (rust-lang/cargo#11694)
- Update CHANGELOG for 1.68 backports (rust-lang/cargo#11690)
- Update 1password to the version 2 CLI (rust-lang/cargo#11692)
- chore: autolabel more for `A-*` (rust-lang/cargo#11679)

r? `@ghost`
@ehuss ehuss added this to the 1.69.0 milestone Mar 9, 2023
RalfJung pushed a commit to RalfJung/rust-analyzer that referenced this pull request Apr 20, 2024
@bors
Auto merge of #107993 - weihanglo:update-cargo, r=weihanglo
02e04ef 
Update cargo

10 commits in 82c3bb79e3a19a5164e33819ef81bfc2c984bc56..39c13e67a5962466cc7253d41bc1099bbcb224c3 2023-02-04 22:52:16 +0000 to 2023-02-12 02:01:08 +0000

- chore: Update to toml v0.6, toml_edit v0.18 (rust-lang/cargo#11618)
- doc: more doc comments and intra-doc links (rust-lang/cargo#11703)
- Deny warnings in CI, not locally (rust-lang/cargo#11699)
- add comment to lto.rs (rust-lang/cargo#11701)
- Re-export cargo_new::NewProjectKind as public (rust-lang/cargo#11700)
- Add '-C' flag for changing current dir before build (rust-lang/cargo#10952)
- `-Zrustdoc-scrape-example` must fail with bad build script (rust-lang/cargo#11694)
- Update CHANGELOG for 1.68 backports (rust-lang/cargo#11690)
- Update 1password to the version 2 CLI (rust-lang/cargo#11692)
- chore: autolabel more for `A-*` (rust-lang/cargo#11679)

r? `@ghost`
RalfJung pushed a commit to RalfJung/rust-analyzer that referenced this pull request Apr 27, 2024
@bors
Auto merge of #107993 - weihanglo:update-cargo, r=weihanglo
654ca6d 
Update cargo

10 commits in 82c3bb79e3a19a5164e33819ef81bfc2c984bc56..39c13e67a5962466cc7253d41bc1099bbcb224c3 2023-02-04 22:52:16 +0000 to 2023-02-12 02:01:08 +0000

- chore: Update to toml v0.6, toml_edit v0.18 (rust-lang/cargo#11618)
- doc: more doc comments and intra-doc links (rust-lang/cargo#11703)
- Deny warnings in CI, not locally (rust-lang/cargo#11699)
- add comment to lto.rs (rust-lang/cargo#11701)
- Re-export cargo_new::NewProjectKind as public (rust-lang/cargo#11700)
- Add '-C' flag for changing current dir before build (rust-lang/cargo#10952)
- `-Zrustdoc-scrape-example` must fail with bad build script (rust-lang/cargo#11694)
- Update CHANGELOG for 1.68 backports (rust-lang/cargo#11690)
- Update 1password to the version 2 CLI (rust-lang/cargo#11692)
- chore: autolabel more for `A-*` (rust-lang/cargo#11679)

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

@ehuss ehuss ehuss left review comments

@weihanglo weihanglo weihanglo left review comments

Assignees

@ehuss ehuss

Labels
A-configuration Area: cargo config files and env vars A-lockfile Area: Cargo.lock issues A-manifest Area: Cargo.toml issues A-testing-cargo-itself Area: cargo's tests A-workspaces Area: workspaces Command-metadata Command-new Command-vendor S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.69.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@epage @rustbot @ehuss @bors @weihanglo