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 Rust to 1.84.0 to match mozilla-central #6572

Merged
merged 1 commit into from
Feb 6, 2025

Conversation

mhammond
Copy link
Member

Pull Request checklist

  • Breaking changes: This PR follows our breaking change policy
    • This PR follows the breaking change policy:
      • This PR has no breaking API changes, or
      • There are corresponding PRs for our consumer applications that resolve the breaking changes and have been approved
  • Quality: This PR builds and tests run cleanly
    • Note:
      • For changes that need extra cross-platform testing, consider adding [ci full] to the PR title.
      • If this pull request includes a breaking change, consider cutting a new release after merging.
  • Tests: This PR includes thorough tests or an explanation of why it does not
  • Changelog: This PR includes a changelog entry in CHANGELOG.md or an explanation of why it does not need one
    • Any breaking changes to Swift or Kotlin binding APIs are noted explicitly
  • Dependencies: This PR follows our dependency management guidelines
    • Any new dependencies are accompanied by a summary of the due diligence applied in selecting them.

Branch builds: add [firefox-android: branch-name] to the PR title.

@@ -24,3 +24,6 @@ uniffi = { version = "0.28.2", features=["build"]}
# Temp hack for uniffi 0.28 generated code, will not be necessary after next uniffi update.
[lints.clippy]
empty-line-after-doc-comments = "allow"

[features]
Copy link
Member Author

Choose a reason for hiding this comment

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

this one surprised me - the error crate had a cfg gate for a non-defined feature. Due to the use of macros, this feature also bleeds into rc_crypto. I think we can probably kill this feature as it's (obviously) unused, but I didn't want to do that here at this time (although open to suggestions I should)

@@ -2,6 +2,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */

#![allow(unexpected_cfgs)]
Copy link
Member Author

Choose a reason for hiding this comment

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

This one is because clippy is complaining about some feature when using [ctor::ctor]. I'm not sure how that feature relates, but this is test code so I took the path of least resistance.

@mhammond mhammond force-pushed the push-zovppususwll branch 4 times, most recently from d4bcb6c to 67269e2 Compare February 5, 2025 04:20
@mhammond mhammond requested review from brennie, badboy and bendk February 5, 2025 04:21
@mhammond
Copy link
Member Author

mhammond commented Feb 5, 2025

Now with bonus openssl version bump!

@mhammond mhammond mentioned this pull request Feb 5, 2025
5 tasks
Copy link
Contributor

@bendk bendk left a comment

Choose a reason for hiding this comment

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

Changes look good, thanks for doing this.

@mhammond mhammond added this pull request to the merge queue Feb 5, 2025
Merged via the queue into mozilla:main with commit b53ce52 Feb 6, 2025
16 checks passed
@mhammond mhammond deleted the push-zovppususwll branch February 6, 2025 00:07
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