Skip to content

Commit aecdfaf

Browse files
authored
fix(core): raw-window-handle dependency, closes #2460 (#2465)
1 parent 8d1fe0e commit aecdfaf

File tree

17 files changed

+7374
-37
lines changed

17 files changed

+7374
-37
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"tauri": patch
3+
---
4+
5+
Fix `raw-window-handle` dependency declaration.

Cargo.toml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,12 @@ members = [
77
"core/tauri-macros",
88
"core/tauri-utils",
99
"core/tauri-build",
10-
"core/tauri-codegen",
11-
12-
# examples
10+
"core/tauri-codegen"
11+
]
12+
exclude = [
13+
# examples that can be compiled with the tauri CLI
1314
"examples/api/src-tauri",
14-
"examples/commands/src-tauri",
15-
"examples/helloworld/src-tauri",
16-
"examples/multiwindow/src-tauri",
17-
"examples/navigation/src-tauri",
18-
"examples/splashscreen/src-tauri",
19-
"examples/state/src-tauri",
20-
"examples/sidecar/src-tauri",
21-
"examples/resources/src-tauri",
22-
# used to build updater artifacts
23-
"examples/updater/src-tauri",
15+
"examples/updater/src-tauri"
2416
]
2517

2618
# default to small, optimized workspace release binaries

core/tauri/Cargo.toml

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ open = { version = "2.0", optional = true }
6767
shared_child = { version = "0.3", optional = true }
6868
os_pipe = { version = "0.9", optional = true }
6969
rfd = { version = "0.4.3", features = [ "parent" ] }
70-
raw-window-handle = { version = "0.3.3", optional = true }
70+
raw-window-handle = "0.3.3"
7171
minisign-verify = { version = "0.1", optional = true }
7272
os_info = { version = "3.0.6", optional = true }
7373
futures-lite = "1.12"
@@ -129,10 +129,38 @@ shell-all = [ "shell-open", "shell-execute" ]
129129
shell-execute = [ "shared_child", "os_pipe" ]
130130
shell-open = [ "open" ]
131131
dialog-all = [ "dialog-open", "dialog-save" ]
132-
dialog-open = [ "raw-window-handle" ]
133-
dialog-save = [ "raw-window-handle" ]
132+
dialog-open = [ ]
133+
dialog-save = [ ]
134134
http-all = [ ]
135135
http-request = [ ]
136136
notification-all = [ "notify-rust" ]
137137
global-shortcut-all = [ ]
138138
os-all = [ "os_info" ]
139+
140+
[[example]]
141+
name = "commands"
142+
path = "../../examples/commands/src-tauri/src/main.rs"
143+
144+
[[example]]
145+
name = "helloworld"
146+
path = "../../examples/helloworld/src-tauri/src/main.rs"
147+
148+
[[example]]
149+
name = "multiwindow"
150+
path = "../../examples/multiwindow/src-tauri/src/main.rs"
151+
152+
[[example]]
153+
name = "navigation"
154+
path = "../../examples/navigation/src-tauri/src/main.rs"
155+
156+
[[example]]
157+
name = "splashscreen"
158+
path = "../../examples/splashscreen/src-tauri/src/main.rs"
159+
160+
[[example]]
161+
name = "state"
162+
path = "../../examples/state/src-tauri/src/main.rs"
163+
164+
[[example]]
165+
name = "resources"
166+
path = "../../examples/resources/src-tauri/src/main.rs"

core/tauri/src/api/process/command.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ impl Command {
318318
let (mut rx, _child) = self.spawn()?;
319319
let code = crate::async_runtime::block_on(async move {
320320
let mut code = None;
321+
#[allow(clippy::collapsible_match)]
321322
while let Some(event) = rx.recv().await {
322323
if let CommandEvent::Terminated(payload) = event {
323324
code = payload.code;

core/tauri/src/updater/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,6 @@ pub(crate) async fn check_update_with_dialog<R: Runtime>(
410410
EVENT_STATUS_ERROR,
411411
Some(dialog.err().unwrap().to_string()),
412412
);
413-
414-
return;
415413
}
416414
}
417415
}

0 commit comments

Comments
 (0)