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

Update serde in workspace and non-synced dependencies #111160

Merged
merged 1 commit into from
May 18, 2023
Merged

Update serde in workspace and non-synced dependencies #111160

merged 1 commit into from
May 18, 2023

Conversation

chbaker0
Copy link
Contributor

@chbaker0 chbaker0 commented May 3, 2023

The main workspace, bootstrap, cargo, miri, and rust-analyzer all lock serde to different versions. It's preferable to share the same version where possible, so update it.

Rustfmt is synced from another repository and has its own Cargo.lock, but since it's added to the overall workspace it should respect the version here.

Cargo is already at the latest version. Miri and rust-analyzer would require upstream updates.

@rustbot
Copy link
Collaborator

rustbot commented May 3, 2023

r? @Mark-Simulacrum

(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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels May 3, 2023
@rustbot
Copy link
Collaborator

rustbot commented May 3, 2023

These commits modify the Cargo.lock file. Random changes to Cargo.lock can be introduced when switching branches and rebasing PRs.
This was probably unintentional and should be reverted before this PR is merged.

If this was intentional then you can ignore this comment.

@chbaker0
Copy link
Contributor Author

chbaker0 commented May 3, 2023

Added updates to syn and quote, which are relevant for serde_derive.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@chbaker0
Copy link
Contributor Author

chbaker0 commented May 3, 2023

I really hope those test failures aren't related...

BTW we have a lot of duplicate dependencies like this, and I think deduping them would improve build times quite a bit.

@bors
Copy link
Contributor

bors commented May 7, 2023

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

@Mark-Simulacrum Mark-Simulacrum 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 May 7, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@chbaker0
Update serde in workspace and non-synced dependencies
1d640e5 
The main workspace, bootstrap, cargo, miri, and rust-analyzer all lock
serde to different versions. It's preferable to share the same version
where possible, so update it.

Rustfmt is synced from another repository and has its own Cargo.lock,
but since it's added to the overall workspace it should respect the
version here.

Cargo is already at the latest version. Miri and rust-analyzer would
require upstream updates.
@chbaker0
Copy link
Contributor Author

chbaker0 commented May 7, 2023

From local testing, looks like the syn 2.0.8 -> 2.0.15 update breaks some rustc macros

@chbaker0
Copy link
Contributor Author

chbaker0 commented May 7, 2023

@rustbot -S-waiting-on-author +S-waiting-on-review

I think this can be reviewed now

@chbaker0
Copy link
Contributor Author

chbaker0 commented May 7, 2023

mm

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 7, 2023
klensy
klensy reviewed May 8, 2023
View reviewed changes
src/bootstrap/Cargo.lock
version = "2.0.15"
version = "2.0.8"
Copy link
Contributor

Choose a reason for hiding this comment

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

Why downgrade? There no rustc-workspace-hack now, so no need to sync versions, plus this is bootstrap-only lock file.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, let's try to avoid downgrading where possible. That just means another PR coming along eventually trying to bump this back up :)

Copy link
Member

Choose a reason for hiding this comment

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

From local testing, looks like the syn 2.0.8 -> 2.0.15 update breaks some rustc macros

Ah, missed this comment. Do we have an issue tracking that yet? It seems like that's probably breakage that needs to be reported upstream to syn?

Copy link
Contributor

Choose a reason for hiding this comment

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

This is bootstrap lock, and breakage with version bump in workspace lock, i assume.

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

I think we can move ahead with this for now.

@bors
Copy link
Contributor

bors commented May 18, 2023

📌 Commit 1d640e5 has been approved by Mark-Simulacrum

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 May 18, 2023
@Dylan-DPC Dylan-DPC mentioned this pull request May 18, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 18, 2023
@bors
Auto merge of rust-lang#111710 - Dylan-DPC:rollup-eutrx54, r=Dylan-DPC
9052ca9 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#110884 (Support RISC-V unaligned-scalar-mem target feature)
 - rust-lang#111160 (Update serde in workspace and non-synced dependencies)
 - rust-lang#111168 (Specialize ToString implementation for fmt::Arguments)
 - rust-lang#111527 (add examples of port 0 binding behavior)
 - rust-lang#111561 (Include better context for "already exists" error in compiletest)
 - rust-lang#111633 (Avoid `&format("...")` calls in error message code.)
 - rust-lang#111679 (Remove libs message about ACPs from triagebot)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 57172a0 into rust-lang:master May 18, 2023
@rustbot rustbot added this to the 1.71.0 milestone May 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum left review comments

@klensy klensy klensy left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
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)
Projects
None yet
Milestone
1.71.0
Development

Successfully merging this pull request may close these issues.
6 participants
@chbaker0 @rustbot @rust-log-analyzer @bors @Mark-Simulacrum @klensy