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

fix: support rust 1.54 #43

Merged
merged 1 commit into from
Aug 15, 2021
Merged

fix: support rust 1.54 #43

merged 1 commit into from
Aug 15, 2021

Conversation

branchvincent
Copy link
Contributor

This upgrades git2 to fix an incompatibility with rust 1.54

Stacktrace
error[E0495]: cannot infer an appropriate lifetime due to conflicting requirements
  --> /Users/brew/Library/Caches/Homebrew/cargo_cache/registry/src/jackfan.us.kg-1ecc6299db9ec823/git2-0.13.19/src/attr.rs:74:15
   |
74 |         match (self, other) {
   |               ^^^^^^^^^^^^^
   |
note: first, the lifetime cannot outlive the anonymous lifetime defined on the method body at 73:26...
  --> /Users/brew/Library/Caches/Homebrew/cargo_cache/registry/src/jackfan.us.kg-1ecc6299db9ec823/git2-0.13.19/src/attr.rs:73:26
   |
73 |     fn eq(&self, other: &AttrValue<'_>) -> bool {
   |                          ^^^^^^^^^^^^^
note: ...so that the types are compatible
  --> /Users/brew/Library/Caches/Homebrew/cargo_cache/registry/src/jackfan.us.kg-1ecc6299db9ec823/git2-0.13.19/src/attr.rs:74:15
   |
74 |         match (self, other) {
   |               ^^^^^^^^^^^^^
   = note: expected `(&AttrValue<'_>, &AttrValue<'_>)`
              found `(&AttrValue<'_>, &AttrValue<'_>)`
note: but, the lifetime must be valid for the lifetime `'_` as defined on the impl at 72:30...
  --> /Users/brew/Library/Caches/Homebrew/cargo_cache/registry/src/jackfan.us.kg-1ecc6299db9ec823/git2-0.13.19/src/attr.rs:72:30
   |
72 | impl PartialEq for AttrValue<'_> {
   |                              ^^
note: ...so that the types are compatible
  --> /Users/brew/Library/Caches/Homebrew/cargo_cache/registry/src/jackfan.us.kg-1ecc6299db9ec823/git2-0.13.19/src/attr.rs:79:16
   |
79 |             | (Self::Bytes(bytes), AttrValue::String(string)) => string.as_bytes() == *bytes,
   |                ^^^^^^^^^^^^^^^^^^
   = note: expected `AttrValue<'_>`
              found `AttrValue<'_>`

error: aborting due to previous error

For more information about this error, try `rustc --explain E0495`.
error: failed to compile `cargo-instruments v0.4.1 (/private/tmp/cargo-instruments-20210801-36371-8u06ls/cargo-instruments-0.4.1)`, intermediate artifacts can be found at `/private/tmp/cargo-instruments-20210801-36371-8u06ls/cargo-instruments-0.4.1/target`

Caused by:
  could not compile `git2`

To learn more, run the command again with --verbose.

For more info, see

@cmyr
Copy link
Owner

cmyr commented Aug 15, 2021

Tested manually, will fix up the clippy stuff separately. Thanks!

@cmyr cmyr merged commit 5371c08 into cmyr:master Aug 15, 2021
@branchvincent branchvincent deleted the rust-1.54 branch August 15, 2021 17:30
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.

2 participants