refactor(cli): simplify `features: Option<Vec<String>>` to `Vec<String>` by sftse · Pull Request #14607 · tauri-apps/tauri

sftse · 2025-12-04T13:53:53Z

Noticed a code pattern where None is used in place of an empty vector. The resulting code has to transform between different representations and liberally uses get_or_insert on the None. This is a bit roundabout, so use empty Vec as a replacement for None.

Empty Vecs don't allocate, so this changes nothing except make the code shorter.

Not entirely sure, but also think this fixes a bug where the code paths of None and Some(Vec::new()) would have diverged.

crates/tauri-cli/src/interface/rust.rs

crates/tauri-cli/src/mobile/android/mod.rs

sftse · 2025-12-04T14:02:04Z

crates/tauri-cli/src/mobile/mod.rs

+fn is_empty(v: &[String]) -> bool {
+  v.is_empty()
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct CliOptions {
  pub dev: bool,
-  pub features: Option<Vec<String>>,
+  #[serde(default)]
+  #[serde(skip_serializing_if = "is_empty")]
+  pub features: Vec<String>,


This Serialize and Deserialize impl is the only publically visible way the change of internal fields might be observable. This uses serde configuration so serialization strings remain identical.

I think this is also different from before, it used to be something like "features": null in JSON

Since I'm not the most familiar with where is this used, I'll leave it to @FabianLars @lucasfernog

Think I checked this (not at workstation rn) and only used internally, will get back to you.

Made a commit highlighting where serialization is used. This seems purely internal, so going with the simpler serialization.

Unresolved this so we get to see this more obviously if anyone ever get back to this PR

github-actions · 2025-12-04T15:02:11Z

Package Changes Through `e68c805`

There are 6 changes which include tauri-utils with patch, tauri-build with patch, tauri-cli with patch, @tauri-apps/cli with patch, tauri-runtime-wry with patch, tauri with patch

Planned Package Versions

The following package releases are the planned based on the context of changes in this pull request.

package	current	next
tauri-utils	2.8.1	2.8.2
tauri-bundler	2.7.5	2.7.6
tauri-runtime	2.9.2	2.9.3
tauri-runtime-wry	2.9.3	2.9.4
tauri-codegen	2.5.2	2.5.3
tauri-macros	2.5.2	2.5.3
tauri-plugin	2.5.2	2.5.3
tauri-build	2.5.3	2.5.4
tauri	2.9.5	2.9.6
@tauri-apps/cli	2.9.6	2.9.7
tauri-cli	2.9.6	2.9.7

Add another change file through the GitHub UI by following this link.

Read about change files or the docs at github.com/jbolda/covector

sftse · 2025-12-05T10:25:30Z

@FabianLars
Fixed CI

sftse · 2025-12-05T10:36:21Z

I'm a bit confused by how the change sets work, the bot suggested

---
"@tauri-apps/api": patch
"tauri-utils": patch
"tauri-macos-sign": patch
"tauri-bundler": patch
"tauri-runtime": patch
"tauri-runtime-wry": patch
"tauri-codegen": patch
"tauri-macros": patch
"tauri-plugin": patch
"tauri-build": patch
"tauri": patch
"@tauri-apps/cli": patch
"tauri-cli": patch
"tauri-driver": patch
---

even though only tauri-cli has any changes. Is this correct?

FabianLars · 2025-12-05T18:35:44Z

no the bot just lists all existing packages. just remove all that you didn't touch (eg in your case only tauri-cli needs to be there)

Legend-Master

Thanks

crates/tauri-cli/src/mobile/android/mod.rs

crates/tauri-cli/src/mobile/ios/mod.rs

Legend-Master · 2025-12-06T06:21:58Z

crates/tauri-cli/src/mobile/mod.rs

+fn is_empty(v: &[String]) -> bool {
+  v.is_empty()
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct CliOptions {
  pub dev: bool,
-  pub features: Option<Vec<String>>,
+  #[serde(default)]
+  #[serde(skip_serializing_if = "is_empty")]
+  pub features: Vec<String>,


I think this is also different from before, it used to be something like "features": null in JSON

Since I'm not the most familiar with where is this used, I'll leave it to @FabianLars @lucasfernog

sftse · 2025-12-28T13:27:38Z

RFR

.changes/empty-vec-instead-of-none.md

Legend-Master

Thanks

crates/tauri-cli/src/mobile/ios/mod.rs

* refactor(tauri-cli): introduce replacement functions * refactor(tauri-cli): apply replacement to remove.rs * refactor(tauri-cli): apply replacement to icon.rs * refactor(tauri-cli): apply replacement to bundle.rs * refactor(tauri-cli): apply replacement to build.rs * refactor(tauri-cli): apply replacement to add.rs * refactor(tauri-cli): apply replacement to dev.rs * refactor(tauri-cli): less controlflow * refactor(tauri-cli): split config loading from locking static * refactor(tauri-cli): remove duplicate checks covered by if let Some(tauri_dir) = tauri_dir tauri_dir.is_some() must be true, otherwise the entire block is not run, so the frontend_dir check is irrelevant * fmt * refactor(tauri-cli): apply replacement to inspect.rs * refactor(tauri-cli): dont use statics for config * refactor(tauri-cli): finish threading directory paths through functions * fix: clippy * fixup CI * refactor(tauri-cli): dont need mutex * refactor(tauri-cli): rescope mutex use to minimal necessary * fix CI, reduce mutex use * fixup PR #14607 * fix: clippy * refactor(tauri-cli): remove ConfigHandle * refactor(tauri-cli): remove more unwraps and panicing functions * refactor(tauri-cli): less mutexes * refactor(tauri-cli): undo mistaken change, address review comment * Split android build to 2 functions * Pass in dirs to migration v1 like the v2 beta * Add change file --------- Co-authored-by: Tony <legendmastertony@gmail.com>

* refactor(tauri-cli): introduce replacement functions * refactor(tauri-cli): apply replacement to remove.rs * refactor(tauri-cli): apply replacement to icon.rs * refactor(tauri-cli): apply replacement to bundle.rs * refactor(tauri-cli): apply replacement to build.rs * refactor(tauri-cli): apply replacement to add.rs * refactor(tauri-cli): apply replacement to dev.rs * refactor(tauri-cli): less controlflow * refactor(tauri-cli): split config loading from locking static * refactor(tauri-cli): remove duplicate checks covered by if let Some(tauri_dir) = tauri_dir tauri_dir.is_some() must be true, otherwise the entire block is not run, so the frontend_dir check is irrelevant * fmt * refactor(tauri-cli): apply replacement to inspect.rs * refactor(tauri-cli): dont use statics for config * refactor(tauri-cli): finish threading directory paths through functions * fix: clippy * fixup CI * refactor(tauri-cli): dont need mutex * refactor(tauri-cli): rescope mutex use to minimal necessary * fix CI, reduce mutex use * fixup PR tauri-apps#14607 * fix: clippy * refactor(tauri-cli): remove ConfigHandle * refactor(tauri-cli): remove more unwraps and panicing functions * refactor(tauri-cli): less mutexes * refactor(tauri-cli): undo mistaken change, address review comment * Split android build to 2 functions * Pass in dirs to migration v1 like the v2 beta * Add change file --------- Co-authored-by: Tony <legendmastertony@gmail.com>

sftse requested a review from a team as a code owner December 4, 2025 13:53

github-project-automation bot added this to Roadmap Dec 4, 2025

github-project-automation bot moved this to 📬Proposal in Roadmap Dec 4, 2025

sftse commented Dec 4, 2025

View reviewed changes

crates/tauri-cli/src/interface/rust.rs Show resolved Hide resolved

sftse commented Dec 4, 2025

View reviewed changes

sftse force-pushed the none-empty branch from a718512 to bf7f090 Compare December 4, 2025 15:24

sftse mentioned this pull request Dec 5, 2025

Respect required-features field from Cargo.toml #14379

Merged

sftse force-pushed the none-empty branch from bf7f090 to e108247 Compare December 5, 2025 10:11

Legend-Master previously approved these changes Dec 6, 2025

View reviewed changes

sftse added 5 commits December 28, 2025 14:23

refactor: use empty vector for features instead of None

39ead6f

refactor: reorder

a94c4d8

add change file

0892a98

comment: highlight places where serialization is used

92cdcf6

refactor: simplify serialization

948ad72

sftse dismissed Legend-Master’s stale review via 948ad72 December 28, 2025 13:24

sftse force-pushed the none-empty branch from e6623ea to 948ad72 Compare December 28, 2025 13:24

Legend-Master previously approved these changes Dec 28, 2025

View reviewed changes

.changes/empty-vec-instead-of-none.md Outdated Show resolved Hide resolved

Update .changes/empty-vec-instead-of-none.md

117afc1

Legend-Master dismissed their stale review via 117afc1 December 29, 2025 05:09

Merge branch 'dev' into none-empty

5afd3cd

Legend-Master previously approved these changes Dec 29, 2025

View reviewed changes

Legend-Master reviewed Dec 29, 2025

View reviewed changes

crates/tauri-cli/src/mobile/ios/mod.rs Outdated Show resolved Hide resolved

Legend-Master dismissed their stale review via e68c805 December 29, 2025 05:14

Update crates/tauri-cli/src/mobile/ios/mod.rs

e68c805

Legend-Master approved these changes Dec 29, 2025

View reviewed changes

Legend-Master changed the title ~~None empty~~ refactor(cli): simplify features: Option<Vec<String>> to Vec<String> Dec 29, 2025

Legend-Master merged commit a2abe2e into tauri-apps:dev Dec 29, 2025
18 of 19 checks passed

github-project-automation bot moved this from 📬Proposal to 🔎 In audit in Roadmap Dec 29, 2025

github-actions bot mentioned this pull request Dec 29, 2025

Apply Version Updates From Current Changes #14639

Merged

sftse deleted the none-empty branch December 29, 2025 16:36

sftse added a commit to sftse/tauri that referenced this pull request Dec 29, 2025

fixup PR tauri-apps#14607

6e3672f

sftse added a commit to sftse/tauri that referenced this pull request Dec 29, 2025

fixup PR tauri-apps#14607

93401e3

sftse added a commit to sftse/tauri that referenced this pull request Dec 29, 2025

fixup PR tauri-apps#14607

fdbaf1f

Uh oh!

Conversation

sftse commented Dec 4, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sftse Dec 4, 2025

Choose a reason for hiding this comment

Uh oh!

Legend-Master Dec 6, 2025

Choose a reason for hiding this comment

Uh oh!

sftse Dec 6, 2025

Choose a reason for hiding this comment

Uh oh!

sftse Dec 28, 2025

Choose a reason for hiding this comment

Uh oh!

Legend-Master Dec 29, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Dec 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Package Changes Through e68c805

Uh oh!

sftse commented Dec 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sftse commented Dec 5, 2025

Uh oh!

FabianLars commented Dec 5, 2025

Uh oh!

Legend-Master left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Legend-Master Dec 6, 2025

Choose a reason for hiding this comment

Uh oh!

sftse commented Dec 28, 2025

Uh oh!

Uh oh!

Legend-Master left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

github-actions bot commented Dec 4, 2025 •

edited

Loading

Package Changes Through `e68c805`

sftse commented Dec 5, 2025 •

edited

Loading