Skip to content

merge recent upstream - #2

Merged
mkmks merged 27 commits into
rel-0.103from
rel-0.103-mergeupstream
Aug 21, 2026
Merged

mkmks merged 27 commits into
rel-0.103from
rel-0.103-mergeupstream

Conversation

@mkmks

@mkmks mkmks commented Aug 21, 2026

Copy link
Copy Markdown

No description provided.

ctz and others added 27 commits March 20, 2026 16:05
Bumps [taiki-e/cache-cargo-install-action](https://github.com/taiki-e/cache-cargo-install-action) from 2 to 3.
- [Release notes](https://github.com/taiki-e/cache-cargo-install-action/releases)
- [Changelog](https://github.com/taiki-e/cache-cargo-install-action/blob/main/CHANGELOG.md)
- [Commits](taiki-e/cache-cargo-install-action@v2...v3)

---
updated-dependencies:
- dependency-name: taiki-e/cache-cargo-install-action
  dependency-version: '3'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
```
error: `panic` is ambiguous
   --> src/./alg_tests.rs:699:26
    |
699 |             unhandled => panic!("extend der2text for tag 0x{unhandled:x?}"),
    |                          ^^^^^ ambiguous name
    |
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #147319 <rust-lang/rust#147319>
    = note: ambiguous because of a conflict between a name from a glob import and an outer scope during import or macro resolution
```
This also means the panic macro isn't ambiguous so we can drop explicit
panic imports.
Of the form:

```
error: this `match` expression can be replaced with `?`
   --> src/crl/types.rs:357:13
    |
357 | /             match revoked_cert_result {
358 | |                 Err(e) => return Err(e),
359 | |                 Ok(revoked_cert) => {
360 | |                     if revoked_cert.serial_number.eq(serial) {
...   |
364 | |             }
    | |_____________^
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/rust-1.97.0/index.html#question_mark
    = note: `-D clippy::question-mark` implied by `-D warnings`
    = help: to override `-D warnings` add `#[allow(clippy::question_mark)]`
```

@titouantanguy titouantanguy left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Minor changes on top of the sync with upstream LGTM.

@mkmks
mkmks merged commit 1636461 into rel-0.103 Aug 21, 2026
40 checks passed
@mkmks
mkmks deleted the rel-0.103-mergeupstream branch August 21, 2026 15:56
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.

5 participants