Skip to content

Commit 4bdf355

Browse files
LegNeatoLegNeato
committed
Rustfmt after rebasing on new rust version
1 parent ef99192 commit 4bdf355

File tree

13 files changed

+84
-81
lines changed
  • tests/difftests/tests
    • arch
      • memory_barriers
      • vector_extract_insert
        • vector_extract_insert-rust/src
        • vector_extract_insert-wgsl/src
      • workgroup_memory/workgroup_memory-ash/src
    • lang
      • control_flow_complex
        • control_flow_complex-rust/src
        • control_flow_complex-wgsl/src
      • core/ops

13 files changed

+84
-81
lines changed

‎tests/difftests/tests/arch/memory_barriers/memory_barriers-rust/src/main.rs

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,22 @@ fn main() {
1010
let initial_data: Vec<u32> = (0..64).collect();
1111
let initial_bytes: Vec<u8> = initial_data.iter().flat_map(|&x| x.to_ne_bytes()).collect();
1212

13-
let test = WgpuComputeTestMultiBuffer::new(RustComputeShader::default(), [1, 1, 1], vec![
14-
BufferConfig {
15-
size: buffer_size,
16-
usage: BufferUsage::StorageReadOnly,
17-
initial_data: Some(initial_bytes),
18-
},
19-
BufferConfig {
20-
size: buffer_size,
21-
usage: BufferUsage::Storage,
22-
initial_data: None,
23-
},
24-
]);
13+
let test = WgpuComputeTestMultiBuffer::new(
14+
RustComputeShader::default(),
15+
[1, 1, 1],
16+
vec![
17+
BufferConfig {
18+
size: buffer_size,
19+
usage: BufferUsage::StorageReadOnly,
20+
initial_data: Some(initial_bytes),
21+
},
22+
BufferConfig {
23+
size: buffer_size,
24+
usage: BufferUsage::Storage,
25+
initial_data: None,
26+
},
27+
],
28+
);
2529

2630
test.run_test(&config).unwrap();
2731
}

‎tests/difftests/tests/arch/memory_barriers/memory_barriers-wgsl/src/main.rs

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,22 @@ fn main() {
1010
let initial_data: Vec<u32> = (0..64).collect();
1111
let initial_bytes: Vec<u8> = initial_data.iter().flat_map(|&x| x.to_ne_bytes()).collect();
1212

13-
let test = WgpuComputeTestMultiBuffer::new(WgslComputeShader::default(), [1, 1, 1], vec![
14-
BufferConfig {
15-
size: buffer_size,
16-
usage: BufferUsage::StorageReadOnly,
17-
initial_data: Some(initial_bytes),
18-
},
19-
BufferConfig {
20-
size: buffer_size,
21-
usage: BufferUsage::Storage,
22-
initial_data: None,
23-
},
24-
]);
13+
let test = WgpuComputeTestMultiBuffer::new(
14+
WgslComputeShader::default(),
15+
[1, 1, 1],
16+
vec![
17+
BufferConfig {
18+
size: buffer_size,
19+
usage: BufferUsage::StorageReadOnly,
20+
initial_data: Some(initial_bytes),
21+
},
22+
BufferConfig {
23+
size: buffer_size,
24+
usage: BufferUsage::Storage,
25+
initial_data: None,
26+
},
27+
],
28+
);
2529

2630
test.run_test(&config).unwrap();
2731
}

‎tests/difftests/tests/arch/vector_extract_insert/vector_extract_insert-rust/src/main.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ fn main() {
55
let config = Config::from_path(std::env::args().nth(1).unwrap()).unwrap();
66

77
let buffer_size = 1024;
8-
let test =
9-
WgpuComputeTestMultiBuffer::new_with_sizes(RustComputeShader::default(), [64, 1, 1], &[
10-
buffer_size,
11-
buffer_size,
12-
buffer_size,
13-
]);
8+
let test = WgpuComputeTestMultiBuffer::new_with_sizes(
9+
RustComputeShader::default(),
10+
[64, 1, 1],
11+
&[buffer_size, buffer_size, buffer_size],
12+
);
1413

1514
test.run_test(&config).unwrap();
1615
}

‎tests/difftests/tests/arch/vector_extract_insert/vector_extract_insert-wgsl/src/main.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ fn main() {
55
let config = Config::from_path(std::env::args().nth(1).unwrap()).unwrap();
66

77
let buffer_size = 1024;
8-
let test =
9-
WgpuComputeTestMultiBuffer::new_with_sizes(WgslComputeShader::default(), [64, 1, 1], &[
10-
buffer_size,
11-
buffer_size,
12-
buffer_size,
13-
]);
8+
let test = WgpuComputeTestMultiBuffer::new_with_sizes(
9+
WgslComputeShader::default(),
10+
[64, 1, 1],
11+
&[buffer_size, buffer_size, buffer_size],
12+
);
1413

1514
test.run_test(&config).unwrap();
1615
}

‎tests/difftests/tests/arch/workgroup_memory/workgroup_memory-ash/src/main.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ fn main() {
88
#[cfg(target_os = "macos")]
99
{
1010
use difftest::scaffold::Skip;
11-
12-
let skip =
13-
Skip::new("Ash tests are skipped on macOS due to MoltenVK configuration issues");
11+
12+
let skip = Skip::new("Ash tests are skipped on macOS due to MoltenVK configuration issues");
1413
skip.run_test(&config).unwrap();
1514
return;
1615
}

‎tests/difftests/tests/lang/control_flow_complex/control_flow_complex-rust/src/main.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ fn main() {
55
let config = Config::from_path(std::env::args().nth(1).unwrap()).unwrap();
66

77
let buffer_size = 1024;
8-
let test =
9-
WgpuComputeTestMultiBuffer::new_with_sizes(RustComputeShader::default(), [64, 1, 1], &[
10-
buffer_size,
11-
buffer_size,
12-
]);
8+
let test = WgpuComputeTestMultiBuffer::new_with_sizes(
9+
RustComputeShader::default(),
10+
[64, 1, 1],
11+
&[buffer_size, buffer_size],
12+
);
1313

1414
test.run_test(&config).unwrap();
1515
}

‎tests/difftests/tests/lang/control_flow_complex/control_flow_complex-wgsl/src/main.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ fn main() {
55
let config = Config::from_path(std::env::args().nth(1).unwrap()).unwrap();
66

77
let buffer_size = 1024;
8-
let test =
9-
WgpuComputeTestMultiBuffer::new_with_sizes(WgslComputeShader::default(), [64, 1, 1], &[
10-
buffer_size,
11-
buffer_size,
12-
]);
8+
let test = WgpuComputeTestMultiBuffer::new_with_sizes(
9+
WgslComputeShader::default(),
10+
[64, 1, 1],
11+
&[buffer_size, buffer_size],
12+
);
1313

1414
test.run_test(&config).unwrap();
1515
}

‎tests/difftests/tests/lang/core/ops/bitwise_ops/bitwise_ops-rust/src/main.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ fn main() {
55
let config = Config::from_path(std::env::args().nth(1).unwrap()).unwrap();
66

77
let buffer_size = 1024;
8-
let test =
9-
WgpuComputeTestMultiBuffer::new_with_sizes(RustComputeShader::default(), [64, 1, 1], &[
10-
buffer_size,
11-
buffer_size,
12-
buffer_size,
13-
]);
8+
let test = WgpuComputeTestMultiBuffer::new_with_sizes(
9+
RustComputeShader::default(),
10+
[64, 1, 1],
11+
&[buffer_size, buffer_size, buffer_size],
12+
);
1413

1514
test.run_test(&config).unwrap();
1615
}

‎tests/difftests/tests/lang/core/ops/bitwise_ops/bitwise_ops-wgsl/src/main.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ fn main() {
55
let config = Config::from_path(std::env::args().nth(1).unwrap()).unwrap();
66

77
let buffer_size = 1024;
8-
let test =
9-
WgpuComputeTestMultiBuffer::new_with_sizes(WgslComputeShader::default(), [64, 1, 1], &[
10-
buffer_size,
11-
buffer_size,
12-
buffer_size,
13-
]);
8+
let test = WgpuComputeTestMultiBuffer::new_with_sizes(
9+
WgslComputeShader::default(),
10+
[64, 1, 1],
11+
&[buffer_size, buffer_size, buffer_size],
12+
);
1413

1514
test.run_test(&config).unwrap();
1615
}

‎tests/difftests/tests/lang/core/ops/trig_ops/trig_ops-rust/src/main.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ fn main() {
55
let config = Config::from_path(std::env::args().nth(1).unwrap()).unwrap();
66

77
let buffer_size = 1024;
8-
let test =
9-
WgpuComputeTestMultiBuffer::new_with_sizes(RustComputeShader::default(), [64, 1, 1], &[
10-
buffer_size,
11-
buffer_size,
12-
]);
8+
let test = WgpuComputeTestMultiBuffer::new_with_sizes(
9+
RustComputeShader::default(),
10+
[64, 1, 1],
11+
&[buffer_size, buffer_size],
12+
);
1313

1414
test.run_test(&config).unwrap();
1515
}

0 commit comments

Comments
 (0)