Remove duplicate dependencies for rustc #120177

michaelciraci · 2024-01-20T23:08:35Z

Removed several duplicates for rustc: #75704

Several duplicates still exist, but an external library would have to be updated first.

These are the duplicate dependencies still outstanding:

annotate-snippets v0.9.1
annotate-snippets v0.10.1

bitflags v1.3.2
bitflags v2.4.1

cargo_metadata v0.15.4
cargo_metadata v0.18.0

darling v0.14.4
darling v0.20.3

darling_core v0.14.4
darling_core v0.20.3

darling_macro v0.14.4
darling_macro v0.20.3

regex-automata v0.1.10
regex-automata v0.2.0
regex-automata v0.4.3

regex-syntax v0.6.29
regex-syntax v0.7.2
regex-syntax v0.8.2

self_cell v0.10.3
self_cell v1.0.2

syn v1.0.109
syn v2.0.32

toml v0.5.11
toml v0.7.5

It should not be hard to consolidate these remaining duplicate dependencies, but it will take time as it would be pull requests for external crates.

r? @jyn514

rustbot · 2024-01-20T23:08:38Z

Could not assign reviewer from: jyn514.
User(s) jyn514 are either the PR author, already assigned, or on vacation, and there are no other candidates.
Use r? to specify someone else to assign.

rustbot · 2024-01-20T23:08:43Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Mark-Simulacrum (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

@rustbot author: the review is finished, PR author should check the comments and take action accordingly
@rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

rustbot · 2024-01-20T23:08:45Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

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.

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

src/tools/rustfmt/Cargo.toml

Nilstrieb

After removing the clippy changes, can you squash the commits? We can then merge it afterwards.

src/tools/clippy/clippy_dev/Cargo.toml

michaelciraci · 2024-01-21T14:46:24Z

Removed clippy changes as well. I'll open a pull request on the clippy repo.

clubby789 · 2024-01-21T15:00:23Z

I may be misreading, but doesn't this now introduce a new dependency on regex-automata@0.4.3, without removing any? Although it does update dependencies which is good

michaelciraci · 2024-01-21T15:22:42Z

I may be misreading, but doesn't this now introduce a new dependency on regex-automata@0.4.3, without removing any? Although it does update dependencies which is good

That is what it's saying, although it's somewhat misleading because the dependencies will drop off in the separate pull requests for clippy and rustfmt, and then the results in this repo will show when the other repos get merged in.

With that being said though, I can put this pull request on hold until the separate clippy and rustfmt pull requests get merged in.

Nilstrieb · 2024-01-21T16:42:43Z

Waiting only leads to conflicts, so let's not.
@bors r+

bors · 2024-01-21T16:42:45Z

📌 Commit df3ec4c has been approved by Nilstrieb

It is now in the queue for this repository.

…trieb Remove duplicate dependencies for rustc Removed several duplicates for rustc: rust-lang#75704 Several duplicates still exist, but an external library would have to be updated first. These are the duplicate dependencies still outstanding: ``` annotate-snippets v0.9.1 annotate-snippets v0.10.1 bitflags v1.3.2 bitflags v2.4.1 cargo_metadata v0.15.4 cargo_metadata v0.18.0 darling v0.14.4 darling v0.20.3 darling_core v0.14.4 darling_core v0.20.3 darling_macro v0.14.4 darling_macro v0.20.3 regex-automata v0.1.10 regex-automata v0.2.0 regex-automata v0.4.3 regex-syntax v0.6.29 regex-syntax v0.7.2 regex-syntax v0.8.2 self_cell v0.10.3 self_cell v1.0.2 syn v1.0.109 syn v2.0.32 toml v0.5.11 toml v0.7.5 ``` It should not be hard to consolidate these remaining duplicate dependencies, but it will take time as it would be pull requests for external crates. r? `@jyn514`

Rollup of 12 pull requests Successful merges: - rust-lang#118639 (Undeprecate lint `unstable_features` and make use of it in the compiler) - rust-lang#118714 ( Explanation that fields are being used when deriving `(Partial)Ord` on enums) - rust-lang#119801 (Fix deallocation with wrong allocator in (A)Rc::from_box_in) - rust-lang#119948 (Make `unsafe_op_in_unsafe_fn` migrated in edition 2024) - rust-lang#119999 (remote-test: use u64 to represent file size) - rust-lang#120058 (bootstrap: improvements for compiler builds) - rust-lang#120160 (Manually implement derived `NonZero` traits.) - rust-lang#120177 (Remove duplicate dependencies for rustc) - rust-lang#120185 (coverage: Don't instrument `#[automatically_derived]` functions) - rust-lang#120194 (Shorten `#[must_use]` Diagnostic Message for `Option::is_none`) - rust-lang#120200 (Correct the anchor of an URL in an error message) - rust-lang#120203 (Replace `#!/bin/bash` with `#!/usr/bin/env bash` in rust-installer tests) r? `@ghost` `@rustbot` modify labels: rollup

Consolidating rustc Dependencies `changelog: none` For dependencies in rustc where there are multiple versions used, this moves the older dependency to the newer dependency. These are the updates to clippy as mentioned here: rust-lang/rust#120177

…trieb Remove duplicate dependencies for rustc Removed several duplicates for rustc: rust-lang#75704 Several duplicates still exist, but an external library would have to be updated first. These are the duplicate dependencies still outstanding: ``` annotate-snippets v0.9.1 annotate-snippets v0.10.1 bitflags v1.3.2 bitflags v2.4.1 cargo_metadata v0.15.4 cargo_metadata v0.18.0 darling v0.14.4 darling v0.20.3 darling_core v0.14.4 darling_core v0.20.3 darling_macro v0.14.4 darling_macro v0.20.3 regex-automata v0.1.10 regex-automata v0.2.0 regex-automata v0.4.3 regex-syntax v0.6.29 regex-syntax v0.7.2 regex-syntax v0.8.2 self_cell v0.10.3 self_cell v1.0.2 syn v1.0.109 syn v2.0.32 toml v0.5.11 toml v0.7.5 ``` It should not be hard to consolidate these remaining duplicate dependencies, but it will take time as it would be pull requests for external crates. r? `@jyn514`

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#119433 (rc,sync: Do not create references to uninitialized values) - rust-lang#119460 (coverage: Never emit improperly-ordered coverage regions) - rust-lang#119766 (Split tait and impl trait in assoc items logic) - rust-lang#120160 (Manually implement derived `NonZero` traits.) - rust-lang#120177 (Remove duplicate dependencies for rustc) - rust-lang#120183 (Add `#[coverage(off)]` to closures introduced by `#[test]` and `#[bench]`) - rust-lang#120185 (coverage: Don't instrument `#[automatically_derived]` functions) - rust-lang#120201 (Bump some deps with syn 1.0 dependencies) - rust-lang#120246 (Re-add estebank to review rotation) r? `@ghost` `@rustbot` modify labels: rollup

…trieb Remove duplicate dependencies for rustc Removed several duplicates for rustc: rust-lang#75704 Several duplicates still exist, but an external library would have to be updated first. These are the duplicate dependencies still outstanding: ``` annotate-snippets v0.9.1 annotate-snippets v0.10.1 bitflags v1.3.2 bitflags v2.4.1 cargo_metadata v0.15.4 cargo_metadata v0.18.0 darling v0.14.4 darling v0.20.3 darling_core v0.14.4 darling_core v0.20.3 darling_macro v0.14.4 darling_macro v0.20.3 regex-automata v0.1.10 regex-automata v0.2.0 regex-automata v0.4.3 regex-syntax v0.6.29 regex-syntax v0.7.2 regex-syntax v0.8.2 self_cell v0.10.3 self_cell v1.0.2 syn v1.0.109 syn v2.0.32 toml v0.5.11 toml v0.7.5 ``` It should not be hard to consolidate these remaining duplicate dependencies, but it will take time as it would be pull requests for external crates. r? ``@jyn514``

Rollup of 13 pull requests Successful merges: - rust-lang#119028 (Add more weirdness to weird-exprs.rs) - rust-lang#119805 (Suggest array::from_fn for array initialization) - rust-lang#120124 (Split assembly tests for ELF and MachO) - rust-lang#120177 (Remove duplicate dependencies for rustc) - rust-lang#120185 (coverage: Don't instrument `#[automatically_derived]` functions) - rust-lang#120188 (compiler: update freebsd and netbsd base specs.) - rust-lang#120201 (Bump some deps with syn 1.0 dependencies) - rust-lang#120215 (Update some deps with `bitflags` v1 dependencies) - rust-lang#120244 (Use `Self` in `NonZero*` implementations.) - rust-lang#120246 (Re-add estebank to review rotation) - rust-lang#120252 (rename `RawTy` to `LoweredTy`) - rust-lang#120255 (correct my mailmap entry) - rust-lang#120270 (A bunch of random modifications) r? `@ghost` `@rustbot` modify labels: rollup

fmease · 2024-01-23T20:27:32Z

#120249 (comment)
#120271 (comment)

@bors rollup=iffy

fmease · 2024-01-23T21:24:37Z

Having thought about this, it's quite likely that updating memchr from 2.5.0 to 2.7.1 causes
#120249 (comment)
#120271 (comment)

See also #120201 (comment)

For now, @bors r-

Consolidating rustc Dependencies changelog: none For dependencies in rustc where there are multiple versions used, this moves the older dependency to the newer dependency. These are the updates to clippy as mentioned here: rust-lang/rust#120177

bors · 2024-02-14T07:37:05Z

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

Dylan-DPC · 2024-02-21T09:54:11Z

@michaelciraci any updates on this? thanks

michaelciraci · 2024-02-22T05:13:17Z

Yeah, I actually made a couple pull requests in some couple dependencies to fast forward those which I was waiting on. Let me go through this again and see if I can remove any other duplicates.

Dylan-DPC · 2024-02-22T05:35:30Z

@michaelciraci thanks. Feel free to link those prs (or mention this pr in those prs) for future tracking.

ytmimi · 2024-02-23T16:41:58Z

src/tools/rustfmt/Cargo.toml

-cargo_metadata = "0.15.4"
+cargo_metadata = "0.18"


Can this wait until the next rustfmt sync? rust-lang/rustfmt#6034 already made this change.

clubby789 · 2024-02-23T16:43:01Z

compiler/rustc_ast/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 # FIXME: bumping memchr to 2.7.1 causes linker errors in MSVC thin-lto
 # tidy-alphabetical-start
 bitflags = "2.4.1"
-memchr = "=2.5.0"


This is necessary, please see the above comment. #121465

rustbot assigned Mark-Simulacrum Jan 20, 2024

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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 Jan 20, 2024

ytmimi reviewed Jan 20, 2024

View reviewed changes

src/tools/rustfmt/Cargo.toml Outdated Show resolved Hide resolved

This was referenced Jan 20, 2024

Update to cargo_metadata 0.18 oli-obk/ui_test#190

Merged

Consolidate duplicate dependencies rust-lang/rustfmt#6033

Closed

Nilstrieb reviewed Jan 21, 2024

View reviewed changes

src/tools/clippy/clippy_dev/Cargo.toml Outdated Show resolved Hide resolved

michaelciraci force-pushed the merge-deps-2 branch from 6064b5d to df3ec4c Compare January 21, 2024 14:45

michaelciraci mentioned this pull request Jan 21, 2024

Consolidating rustc Dependencies rust-lang/rust-clippy#12184

Merged

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 21, 2024

TaKO8Ki mentioned this pull request Jan 21, 2024

Rollup of 12 pull requests #120209

Closed

matthiaskrgr mentioned this pull request Jan 22, 2024

Rollup of 9 pull requests #120249

Closed

fmease mentioned this pull request Jan 23, 2024

Rollup of 13 pull requests #120271

Closed

bors 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 Jan 23, 2024

ytmimi mentioned this pull request Jan 27, 2024

Implement RFC 3373: Avoid non-local definitions in functions #120393

Merged

matthiaskrgr mentioned this pull request Feb 5, 2024

tidy: reduce allocs #120023

Merged

michaelciraci closed this Feb 23, 2024

michaelciraci force-pushed the merge-deps-2 branch from df3ec4c to 52cea08 Compare February 23, 2024 15:39

Updating rustfmt and tidy to cargo_metadata 0.18

64221ac

michaelciraci reopened this Feb 23, 2024

Unpinning memchr=2.5.0 in toml

5a333a9

ytmimi reviewed Feb 23, 2024

View reviewed changes

clubby789 reviewed Feb 23, 2024

View reviewed changes

michaelciraci closed this Feb 23, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove duplicate dependencies for rustc #120177

Remove duplicate dependencies for rustc #120177

michaelciraci commented Jan 20, 2024

rustbot commented Jan 20, 2024

rustbot commented Jan 20, 2024

rustbot commented Jan 20, 2024

Nilstrieb left a comment

michaelciraci commented Jan 21, 2024

clubby789 commented Jan 21, 2024

michaelciraci commented Jan 21, 2024

Nilstrieb commented Jan 21, 2024

bors commented Jan 21, 2024

fmease commented Jan 23, 2024

fmease commented Jan 23, 2024 •

edited

bors commented Feb 14, 2024

Dylan-DPC commented Feb 21, 2024

michaelciraci commented Feb 22, 2024

Dylan-DPC commented Feb 22, 2024

ytmimi Feb 23, 2024

clubby789 Feb 23, 2024

Remove duplicate dependencies for rustc #120177

Remove duplicate dependencies for rustc #120177

Conversation

michaelciraci commented Jan 20, 2024

rustbot commented Jan 20, 2024

rustbot commented Jan 20, 2024

rustbot commented Jan 20, 2024

Nilstrieb left a comment

Choose a reason for hiding this comment

michaelciraci commented Jan 21, 2024

clubby789 commented Jan 21, 2024

michaelciraci commented Jan 21, 2024

Nilstrieb commented Jan 21, 2024

bors commented Jan 21, 2024

fmease commented Jan 23, 2024

fmease commented Jan 23, 2024 • edited

bors commented Feb 14, 2024

Dylan-DPC commented Feb 21, 2024

michaelciraci commented Feb 22, 2024

Dylan-DPC commented Feb 22, 2024

ytmimi Feb 23, 2024

Choose a reason for hiding this comment

clubby789 Feb 23, 2024

Choose a reason for hiding this comment

fmease commented Jan 23, 2024 •

edited