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

Bump cargo_metadata to 0.13 #84850

Closed
wants to merge 1 commit into from

Conversation

Aaron1011
Copy link
Member

This brings the number of copies of cargo_metadata from 3 to 2.
Removing the final duplicate will require updates to rls and rustfmt

This brings the number of copies of `cargo_metadata` from 3 to 2.
Removing the final duplicate will require updates to `rls` and `rustfmt`
@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 May 3, 2021
@rust-log-analyzer
Copy link
Collaborator

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
    Checking clippy_lints v0.1.53 (/checkout/src/tools/clippy/clippy_lints)
error[E0308]: mismatched types
   --> src/tools/clippy/clippy_lints/src/cargo_common_metadata.rs:102:68
    |
102 |                 if is_empty_str(&package.license) && is_empty_path(&package.license_file) {
    |                                                                    ^^^^^^^^^^^^^^^^^^^^^ expected struct `PathBuf`, found struct `Utf8PathBuf`
    |
    = note: expected reference `&std::option::Option<PathBuf>`
               found reference `&std::option::Option<Utf8PathBuf>`
error[E0308]: mismatched types
   --> src/tools/clippy/clippy_lints/src/cargo_common_metadata.rs:110:34
    |
    |
110 |                 if is_empty_path(&package.readme) {
    |                                  ^^^^^^^^^^^^^^^ expected struct `PathBuf`, found struct `Utf8PathBuf`
    |
    = note: expected reference `&std::option::Option<PathBuf>`
               found reference `&std::option::Option<Utf8PathBuf>`
error: aborting due to 2 previous errors

For more information about this error, try `rustc --explain E0308`.
error: could not compile `clippy_lints`

@Aaron1011 Aaron1011 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 3, 2021
@klensy
Copy link
Contributor

klensy commented May 3, 2021

Maybe use 0.12.* for now? There was some discussion about additional dependencies oli-obk/cargo_metadata#152

@bstrie
Copy link
Contributor

bstrie commented May 19, 2021

@Aaron1011 I see you marked this as waiting-on-author, is this PR a draft?

@bors
Copy link
Contributor

bors commented Jun 4, 2021

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

@crlf0710
Copy link
Member

@Aaron1011 CI still red, and there's a merge conflict.

@klensy
Copy link
Contributor

klensy commented Jun 19, 2021

@crlf0710

I don't think its good to bump it to 0.13 now, as i already updated it to 0.12 over rls\rustfmt to reduce duplication (waiting when it will be merged into rust repo). Only need update it for tidy to completely remove old versions.

If it will be updated to 0.13, this will add duplicates again.

@JohnCSimon
Copy link
Member

ping from triage:
@Aaron1011 should this be closed?

@bstrie
Copy link
Contributor

bstrie commented Jul 21, 2021

I'll close this PR for now, since it's unclear if it's still relevant.

@bstrie bstrie closed this Jul 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants