Skip to content

Rustup #7929

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

Merged
merged 10 commits into from
Nov 4, 2021
Merged

Rustup #7929

merged 10 commits into from
Nov 4, 2021

Conversation

flip1995
Copy link
Member

@flip1995 flip1995 commented Nov 4, 2021

r? @ghost

changelog: none

camsteffen and others added 10 commits October 15, 2021 08:04
Don't mark for loop iter expression as desugared

We typically don't mark spans of lowered things as desugared. This helps Clippy rightly discern when code is (not) from expansion. This was discovered by ``@flip1995`` at rust-lang#7789 (comment).
…riplett

Add #[must_use] to len and is_empty

Parent issue: #89692

r? `@joshtriplett`
* semver = "0.11" -> "1.0"
* cargo_metadata = "0.12" -> "0.14"
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
@flip1995
Copy link
Member Author

flip1995 commented Nov 4, 2021

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Nov 4, 2021

📌 Commit c7f5462 has been approved by flip1995

@bors
Copy link
Contributor

bors commented Nov 4, 2021

⌛ Testing commit c7f5462 with merge e181011...

@bors
Copy link
Contributor

bors commented Nov 4, 2021

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: flip1995
Pushing e181011 to master...

@bors bors merged commit e181011 into rust-lang:master Nov 4, 2021
@flip1995 flip1995 deleted the rustup branch November 4, 2021 12:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants