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

aes-siv: bump aes crate to v0.8; MSRV 1.56+ #431

Merged
merged 1 commit into from
Jun 27, 2022
Merged

Conversation

tarcieri
Copy link
Member

No description provided.

Comment on lines -270 to +275
mac.update(&Tag::default());
Mac::update(mac, &Tag::default());
Copy link
Member Author

@tarcieri tarcieri Jun 26, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm still not exactly sure why but I had to disambiguate these:

   Compiling aes-siv v0.7.0-pre (/Users/tony/src/RustCrypto/AEADs/aes-siv)
error[E0034]: multiple applicable items in scope
   --> aes-siv/src/siv.rs:275:9
    |
275 |     mac.update(&Tag::default());
    |         ^^^^^^ multiple `update` found
    |
note: candidate #1 is defined in the trait `Mac`
   --> /Users/tony/.cargo/registry/src/github.com-1ecc6299db9ec823/digest-0.10.3/src/mac.rs:38:5
    |
38  |     fn update(&mut self, data: &[u8]);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
note: candidate #2 is defined in the trait `Update`
   --> /Users/tony/.cargo/registry/src/github.com-1ecc6299db9ec823/digest-0.10.3/src/lib.rs:77:5
    |
77  |     fn update(&mut self, data: &[u8]);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
help: disambiguate the associated function for candidate #1
    |
275 |     Mac::update(&mut mac, &Tag::default());
    |     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
help: disambiguate the associated function for candidate #2
    |
275 |     Update::update(&mut mac, &Tag::default());
    |     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

...which occurs even if the Update trait hasn't been imported or bounded upon, nor is it a bound of Mac, so I'm not sure why this is ambiguous

cc @newpavlov

@tarcieri tarcieri requested a review from newpavlov June 26, 2022 15:27
@codecov-commenter
Copy link

codecov-commenter commented Jun 26, 2022

Codecov Report

Merging #431 (e4a7e30) into master (6b980d9) will decrease coverage by 0.09%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master     #431      +/-   ##
==========================================
- Coverage   87.38%   87.28%   -0.10%     
==========================================
  Files          40       40              
  Lines        1958     1959       +1     
==========================================
- Hits         1711     1710       -1     
- Misses        247      249       +2     
Impacted Files Coverage Δ
aes-siv/src/lib.rs 77.77% <ø> (ø)
aes-siv/src/siv.rs 94.11% <100.00%> (-2.90%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6b980d9...e4a7e30. Read the comment docs.

@tarcieri tarcieri merged commit 464f693 into master Jun 27, 2022
@tarcieri tarcieri deleted the aes-siv/aes-v0.8 branch June 27, 2022 21:45
@tarcieri tarcieri mentioned this pull request Jul 30, 2022
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