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 our lock file and Rust nightly version #3103

Merged
merged 6 commits into from
Feb 7, 2024
Merged

Conversation

poljar
Copy link
Contributor

@poljar poljar commented Feb 7, 2024

The Dalek crates got a new release fixing some build issues on nightly. This should get rid of those build issues.

Link to the relevant issue: dalek-cryptography/curve25519-dalek#618.

The Dalek crates got a new release fixing some build issues on nightly.
This should get rid of those build issues.
@poljar poljar requested a review from a team as a code owner February 7, 2024 11:24
@poljar poljar requested review from Hywan and removed request for a team February 7, 2024 11:24
Copy link
Contributor

@jmartinesp jmartinesp left a comment

Choose a reason for hiding this comment

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

Thanks, I can confirm this fixes the issue for me locally.

@poljar
Copy link
Contributor Author

poljar commented Feb 7, 2024

Thanks, I can confirm this fixes the issue for me locally.

But not on the CI 🥲. I think we'll need to bump our nightly version as well.

@jmartinesp
Copy link
Contributor

jmartinesp commented Feb 7, 2024

We could pin ours to use the same version as yours and avoid bumping the version now. We should do that anyway, whether we bump the nightly here or not.

We'll pin our nightly version in the CI to match yours.

Copy link

codecov bot commented Feb 7, 2024

Codecov Report

Attention: 3 lines in your changes are missing coverage. Please review.

Comparison is base (bcf8cc1) 83.71% compared to head (abaa3ad) 83.70%.
Report is 34 commits behind head on main.

Files Patch % Lines
crates/matrix-sdk-ui/src/timeline/event_handler.rs 66.66% 2 Missing ⚠️
crates/matrix-sdk/src/widget/machine/pending.rs 50.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3103      +/-   ##
==========================================
- Coverage   83.71%   83.70%   -0.01%     
==========================================
  Files         224      224              
  Lines       23534    23535       +1     
==========================================
  Hits        19701    19701              
- Misses       3833     3834       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

The IndexMap::remove method has been deprecated, the documentation[1] on
the method tells us that we can replace the usage of it with
IndexMap::swap_remove:

> NOTE: This is equivalent to .swap_remove(key), replacing this entry’s
> position with the last element, and it is deprecated in favor of
> calling that explicitly.

[1]: https://docs.rs/indexmap/2.2.2/indexmap/map/struct.IndexMap.html#method.remove
Copy link
Member

@Hywan Hywan left a comment

Choose a reason for hiding this comment

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

Approving ahead of time to unblock you.

@poljar poljar enabled auto-merge (rebase) February 7, 2024 12:25
@poljar poljar changed the title Update our lock file Update our lock file and Rust nightly version Feb 7, 2024
The linking error[1] on Mac still isn't fixed.

[1]: seanmonstar/reqwest#2006
@poljar poljar merged commit 5957d96 into main Feb 7, 2024
34 checks passed
@poljar poljar deleted the poljar/bump-dalek branch February 7, 2024 12:57
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.

3 participants