@@ -324,7 +324,8 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
324
324
} ;
325
325
match * expr {
326
326
Expression :: Compose {
327
- ref mut components, ..
327
+ ref mut components,
328
+ ty : _,
328
329
} => {
329
330
for c in components. iter_mut ( ) {
330
331
adjust ( c) ;
@@ -337,13 +338,23 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
337
338
adjust ( base) ;
338
339
adjust ( index) ;
339
340
}
340
- Expression :: AccessIndex { ref mut base, .. } => {
341
+ Expression :: AccessIndex {
342
+ ref mut base,
343
+ index : _,
344
+ } => {
341
345
adjust ( base) ;
342
346
}
343
- Expression :: Splat { ref mut value, .. } => {
347
+ Expression :: Splat {
348
+ ref mut value,
349
+ size : _,
350
+ } => {
344
351
adjust ( value) ;
345
352
}
346
- Expression :: Swizzle { ref mut vector, .. } => {
353
+ Expression :: Swizzle {
354
+ ref mut vector,
355
+ size : _,
356
+ pattern : _,
357
+ } => {
347
358
adjust ( vector) ;
348
359
}
349
360
Expression :: Load { ref mut pointer } => {
@@ -357,7 +368,7 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
357
368
ref mut offset,
358
369
ref mut level,
359
370
ref mut depth_ref,
360
- ..
371
+ gather : _ ,
361
372
} => {
362
373
adjust ( image) ;
363
374
adjust ( sampler) ;
@@ -416,16 +427,21 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
416
427
adjust ( e) ;
417
428
}
418
429
}
419
- _ => { }
430
+ crate :: ImageQuery :: NumLevels
431
+ | crate :: ImageQuery :: NumLayers
432
+ | crate :: ImageQuery :: NumSamples => { }
420
433
}
421
434
}
422
- Expression :: Unary { ref mut expr, .. } => {
435
+ Expression :: Unary {
436
+ ref mut expr,
437
+ op : _,
438
+ } => {
423
439
adjust ( expr) ;
424
440
}
425
441
Expression :: Binary {
426
442
ref mut left,
427
443
ref mut right,
428
- ..
444
+ op : _ ,
429
445
} => {
430
446
adjust ( left) ;
431
447
adjust ( right) ;
@@ -439,11 +455,16 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
439
455
adjust ( accept) ;
440
456
adjust ( reject) ;
441
457
}
442
- Expression :: Derivative { ref mut expr, .. } => {
458
+ Expression :: Derivative {
459
+ ref mut expr,
460
+ axis : _,
461
+ ctrl : _,
462
+ } => {
443
463
adjust ( expr) ;
444
464
}
445
465
Expression :: Relational {
446
- ref mut argument, ..
466
+ ref mut argument,
467
+ fun : _,
447
468
} => {
448
469
adjust ( argument) ;
449
470
}
@@ -452,7 +473,7 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
452
473
ref mut arg1,
453
474
ref mut arg2,
454
475
ref mut arg3,
455
- ..
476
+ fun : _ ,
456
477
} => {
457
478
adjust ( arg) ;
458
479
if let Some ( e) = arg1. as_mut ( ) {
@@ -465,13 +486,20 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
465
486
adjust ( e) ;
466
487
}
467
488
}
468
- Expression :: As { ref mut expr, .. } => {
489
+ Expression :: As {
490
+ ref mut expr,
491
+ kind : _,
492
+ convert : _,
493
+ } => {
469
494
adjust ( expr) ;
470
495
}
471
496
Expression :: ArrayLength ( ref mut expr) => {
472
497
adjust ( expr) ;
473
498
}
474
- Expression :: RayQueryGetIntersection { ref mut query, .. } => {
499
+ Expression :: RayQueryGetIntersection {
500
+ ref mut query,
501
+ committed : _,
502
+ } => {
475
503
adjust ( query) ;
476
504
}
477
505
Expression :: Literal ( _)
@@ -483,8 +511,11 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
483
511
| Expression :: Constant ( _)
484
512
| Expression :: Override ( _)
485
513
| Expression :: ZeroValue ( _)
486
- | Expression :: AtomicResult { .. }
487
- | Expression :: WorkGroupUniformLoadResult { .. } => { }
514
+ | Expression :: AtomicResult {
515
+ ty : _,
516
+ comparison : _,
517
+ }
518
+ | Expression :: WorkGroupUniformLoadResult { ty : _ } => { }
488
519
}
489
520
}
490
521
0 commit comments