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.

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

Update Clippy dependencies #90500

Merged
merged 1 commit into from
Nov 3, 2021
Merged

Conversation

xFrednet
Copy link
Member

@xFrednet xFrednet commented Nov 2, 2021

Clippy has two outdated dependencies, where one indirect dependency has been flagged by rustsec for dropping a lifetime. See RUSTSEC-2020-0146. This PR updates these dependencies.

With previous dependency updates, it was tried to prevent duplicates in the Cargo.lock file of rust-lang/rust. I've tried to keep this in mind with this update.

  • Dependency semver
    • Used in src/tools/cargo/Cargo.toml as version 1.0.3
    • Used in src/tools/rust-analyzer/crates/project_model/Cargo.toml as version 1
    • Updated in Clippy from 0.11 to 1.0 (Clippy usually defines the major and minor patch version). The Cargo.lock file lists 1.0.3 which is one patch version behind the most recent one but prevents a duplicate with cargo's pinned version.
  • Dependency cargo_metadata
    • Used in several tools as 0.14
    • Used in src/tools/tidy and src/tools/rls as 0.12
    • Updated in Clippy from 0.12 to 0.14

All updates to the Cargo.lock have been done automatically by x.py.

There are still some tools with these outdated dependencies. Clippy didn't require any changes, and it would be likely that the others could also be updated without any problem. Let me know if I should try to update them as well 🙃.

Keep up the good work, whoever is reading this 🦀


For Clippy:

changelog: none

* semver = "0.11" -> "1.0"
* cargo_metadata = "0.12" -> "0.14"
@rust-highfive
Copy link
Collaborator

Some changes occurred in src/tools/clippy.

cc @rust-lang/clippy

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 2, 2021
@flip1995
Copy link
Member

flip1995 commented Nov 2, 2021

Thanks! Glad to see that we can now also update those deps without causing too much havoc in the Cargo.lock file!

@flip1995
Copy link
Member

flip1995 commented Nov 2, 2021

This PR only includes Clippy changes and the only packages touched in the Cargo.lock file are Clippy packages. So approving this as a Clippy maintainer:

@bors r+

@bors
Copy link
Contributor

bors commented Nov 2, 2021

📌 Commit fd41336 has been approved by flip1995

@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 Nov 2, 2021
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 2, 2021
…r=flip1995

Update Clippy dependencies

Clippy has two outdated dependencies, where one indirect dependency has been flagged by rustsec for dropping a lifetime. See [RUSTSEC-2020-0146](https://rustsec.org/advisories/RUSTSEC-2020-0146). This PR updates these dependencies.

With previous dependency updates, it was tried to prevent duplicates in the `Cargo.lock` file of rust-lang/rust. I've tried to keep this in mind with this update.

* Dependency `semver`
    * Used in `src/tools/cargo/Cargo.toml` as version `1.0.3`
    * Used in `src/tools/rust-analyzer/crates/project_model/Cargo.toml` as version `1`
    * Updated in Clippy from `0.11` to `1.0` (Clippy usually defines the major and minor patch version). The `Cargo.lock` file lists `1.0.3` which is one patch version behind the most recent one but prevents a duplicate with cargo's pinned version.
* Dependency `cargo_metadata`
    * Used in several tools as `0.14`
    * Used in `src/tools/tidy` and `src/tools/rls` as `0.12`
    * Updated in Clippy from `0.12` to `0.14`

All updates to the `Cargo.lock` have been done automatically by `x.py`.

There are still some tools with these outdated dependencies. Clippy didn't require any changes, and it would be likely that the others could also be updated without any problem. Let me know if I should try to update them as well 🙃.

Keep up the good work, whoever is reading this 🦀

---

For Clippy:

changelog: none
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 3, 2021
…askrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#90084 (Make printed message match the code comment)
 - rust-lang#90354 (Document clippy on nightly-rustc)
 - rust-lang#90417 (stabilize `relaxed_struct_unsize`)
 - rust-lang#90472 (Clarify what to do with accepted feature gates)
 - rust-lang#90500 (Update Clippy dependencies)
 - rust-lang#90502 (Split doc_cfg and doc_auto_cfg features)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 673aafe into rust-lang:master Nov 3, 2021
@rustbot rustbot added this to the 1.58.0 milestone Nov 3, 2021
@xFrednet xFrednet deleted the 00000-update-clippy-deps branch November 3, 2021 09:13
flip1995 pushed a commit to flip1995/rust that referenced this pull request Nov 4, 2021
…r=flip1995

Update Clippy dependencies

Clippy has two outdated dependencies, where one indirect dependency has been flagged by rustsec for dropping a lifetime. See [RUSTSEC-2020-0146](https://rustsec.org/advisories/RUSTSEC-2020-0146). This PR updates these dependencies.

With previous dependency updates, it was tried to prevent duplicates in the `Cargo.lock` file of rust-lang/rust. I've tried to keep this in mind with this update.

* Dependency `semver`
    * Used in `src/tools/cargo/Cargo.toml` as version `1.0.3`
    * Used in `src/tools/rust-analyzer/crates/project_model/Cargo.toml` as version `1`
    * Updated in Clippy from `0.11` to `1.0` (Clippy usually defines the major and minor patch version). The `Cargo.lock` file lists `1.0.3` which is one patch version behind the most recent one but prevents a duplicate with cargo's pinned version.
* Dependency `cargo_metadata`
    * Used in several tools as `0.14`
    * Used in `src/tools/tidy` and `src/tools/rls` as `0.12`
    * Updated in Clippy from `0.12` to `0.14`

All updates to the `Cargo.lock` have been done automatically by `x.py`.

There are still some tools with these outdated dependencies. Clippy didn't require any changes, and it would be likely that the others could also be updated without any problem. Let me know if I should try to update them as well 🙃.

Keep up the good work, whoever is reading this 🦀

---

For Clippy:

changelog: none
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants