Skip to content

Commit 284ed46

Browse files
committed
Spell out the type of the result from map_pass_err.
Without these changes, rust-analyzer cannot determine the type of `cmd_buf`.
1 parent 8e5ac75 commit 284ed46

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

wgpu-core/src/command/compute.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,11 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
309309
let (device_guard, mut token) = hub.devices.read(&mut token);
310310

311311
let (mut cmd_buf_guard, mut token) = hub.command_buffers.write(&mut token);
312-
let cmd_buf = CommandBuffer::get_encoder_mut(&mut *cmd_buf_guard, encoder_id)
313-
.map_pass_err(init_scope)?;
312+
// Spell out the type, to placate rust-analyzer.
313+
// https://github.com/rust-lang/rust-analyzer/issues/12247
314+
let cmd_buf: &mut CommandBuffer<A> =
315+
CommandBuffer::get_encoder_mut(&mut *cmd_buf_guard, encoder_id)
316+
.map_pass_err(init_scope)?;
314317
// will be reset to true if recording is done without errors
315318
cmd_buf.status = CommandEncoderStatus::Error;
316319
let raw = cmd_buf.encoder.open();

wgpu-core/src/command/render.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,8 +1050,11 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
10501050
let (trackers, query_reset_state, pending_discard_init_fixups) = {
10511051
let (mut cmb_guard, mut token) = hub.command_buffers.write(&mut token);
10521052

1053-
let cmd_buf = CommandBuffer::get_encoder_mut(&mut *cmb_guard, encoder_id)
1054-
.map_pass_err(init_scope)?;
1053+
// Spell out the type, to placate rust-analyzer.
1054+
// https://github.com/rust-lang/rust-analyzer/issues/12247
1055+
let cmd_buf: &mut CommandBuffer<A> =
1056+
CommandBuffer::get_encoder_mut(&mut *cmb_guard, encoder_id)
1057+
.map_pass_err(init_scope)?;
10551058
// close everything while the new command encoder is filled
10561059
cmd_buf.encoder.close();
10571060
// will be reset to true if recording is done without errors

0 commit comments

Comments
 (0)