Repository navigation
chore: Merge upstream changes - #15
Merged
Merged
Conversation
…kInfo deprecation fix (#30) Fixes #22 — tokio runtime panic on startup for apps without #[tokio::main] Fixes #25 — IPC error from stale @tauri-apps/api Supersedes #26 Changes: - tokio::spawn → tauri::async_runtime::spawn in client.rs - PanicInfo → PanicHookInfo in lib.rs (stable since Rust 1.81.0) - @tauri-apps/api bumped to ^2.7.0 Reviewed-by: nekename
Exposes default-tls/native-tls/rustls-tls as passthrough features to reqwest, with default = ["default-tls"] preserving current behavior. Consumers can now opt into rustls for Android and other cross-compile targets. Closes #28
… a Changelog format - Rust 1.0.0 → 1.1.0 (bug fix + new TLS feature flags) - JS 0.4.2 → 0.5.0 (@tauri-apps/api ^2.7.0) - CHANGELOG rewritten to Keep a Changelog 1.1.0 format with proper Added/Changed/Fixed sections and issue/PR references - Regenerated permission schemas from tauri-plugin 2.6.3 build
Auto-publish to crates.io and npm on GitHub release. CI runs cargo check + npm build on push/PR.
Disabling reqwest's default features for the TLS flags also dropped charset, http2 and system-proxy. Re-enable them explicitly.
eugencowie
added a commit
that referenced
this pull request
Nov 13, 2026
## Summary
Merges `upstream/main` as a real merge commit, so future comparisons
only show new commits. Conflicts were resolved to keep only the Rust
changes that apply to this fork.
```diff
[dependencies]
-reqwest = { version = "0.12.12", features = ["json"] }
+reqwest = { version = "0.13.4", default-features = false, features = ["json", "charset", "http2", "system-proxy"] }
-rand = "0.9.0"
+rand = "0.10.0"
+[features]
+default = ["default-tls"]
+default-tls = ["reqwest/default-tls"]
+native-tls = ["reqwest/native-tls"]
+rustls-tls = ["reqwest/rustls"]
```
`src/client.rs`: `use rand::Rng` → `use rand::RngExt` (rand 0.10 API).
| Upstream commit | Resolution |
|---|---|
| TLS feature flags | Taken |
| dependency bumps | reqwest 0.13 + rand 0.10 taken; Tauri, JS,
`rust-version` dropped |
| `tauri::async_runtime::spawn` + `PanicHookInfo` | Dropped (no Tauri;
`PanicHookInfo` already here) |
| v1.1.0 bump + CHANGELOG rewrite | Dropped (release-plz owns
versions/changelog) |
| CI + release workflows | Dropped (existing CI + release-plz) |
Unlike upstream, the follow-up commit re-enables reqwest's non-TLS
defaults (`charset`, `http2`, `system-proxy`), which `default-features =
false` would otherwise drop.
## Evidence
- **After:** `mise run check` passes (fmt, clippy, 3 tests). `cargo
clippy --no-default-features --features native-tls` and `--features
rustls-tls` are both clean.
## Merge Danger
**Door:** two-way
**Blast Radius:** consumers
reqwest 0.13's `default-tls` is rustls, not native-tls/OpenSSL, so the
default TLS backend changes for consumers. Use `--no-default-features
--features native-tls` to keep the old behaviour.
eugencowie
added a commit
that referenced
this pull request
Nov 15, 2026
* Merge upstream/main into main Take upstream's reqwest TLS feature flags and the reqwest 0.13 / rand 0.10 bumps from its dependency update. Drop Tauri, JS, and upstream CI/release/changelog changes, which don't apply to this fork. * Keep reqwest's non-TLS default features Disabling reqwest's default features for the TLS flags also dropped charset, http2 and system-proxy. Re-enable them explicitly.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Merges
upstream/mainas a real merge commit, so future comparisons only show new commits. Conflicts were resolved to keep only the Rust changes that apply to this fork.src/client.rs:use rand::Rng→use rand::RngExt(rand 0.10 API).rust-versiondroppedtauri::async_runtime::spawn+PanicHookInfoPanicHookInfoalready here)Unlike upstream, the follow-up commit re-enables reqwest's non-TLS defaults (
charset,http2,system-proxy), whichdefault-features = falsewould otherwise drop.Evidence
mise run checkpasses (fmt, clippy, 3 tests).cargo clippy --no-default-features --features native-tlsand--features rustls-tlsare both clean.Merge Danger
Door: two-way
Blast Radius: consumers
reqwest 0.13's
default-tlsis rustls, not native-tls/OpenSSL, so the default TLS backend changes for consumers. Use--no-default-features --features native-tlsto keep the old behaviour.