Skip to content

chore: Merge upstream changes - #15

Merged
eugencowie merged 7 commits into
mainfrom
merge-upstream
Oct 4, 2026
Merged

eugencowie merged 7 commits into
mainfrom
merge-upstream

Conversation

@eugencowie

@eugencowie eugencowie commented Oct 4, 2026 •

Copy link
Copy Markdown
Owner

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.

 [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.

reatlat and others added 7 commits August 11, 2026 02:53
…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
Bumps all Rust and JS deps to latest, fixes npm run build (tsconfig/rollup),
updates rand 0.10 API, reqwest 0.13 feature rename, rust-version 1.81.0.

Closes #27
Auto-publish to crates.io and npm on GitHub release.
CI runs cargo check + npm build on push/PR.
Take the reqwest TLS feature flags (#34) and the reqwest 0.13 / rand 0.10
bumps from #35. Drop Tauri, JS, and upstream CI/release/changelog changes,
which don't apply to this fork.
Disabling reqwest's default features for the TLS flags also dropped
charset, http2 and system-proxy. Re-enable them explicitly.
@eugencowie eugencowie added the chore Routine maintenance and housekeeping label Oct 4, 2026
@eugencowie eugencowie added this to the 0.2.1 milestone Oct 4, 2026
@eugencowie eugencowie changed the title Merge upstream/main chore: Merge upstream changes Oct 4, 2026
@eugencowie
eugencowie merged commit 36b3e33 into main Oct 4, 2026
1 check passed
@eugencowie
eugencowie deleted the merge-upstream branch October 4, 2026 20:48
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

chore Routine maintenance and housekeeping

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants