Skip to content

Commit f09c132

Browse files
kennykerrkennykerr
authored
Shorten sample crate names (#3416)
1 parent 5e8ce09 commit f09c132

File tree

12 files changed

+47
-70
lines changed

12 files changed

+47
-70
lines changed

‎.github/workflows/clippy.yml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,6 @@ jobs:
4141
run: cargo clippy -p sample_bits
4242
- name: Clippy sample_com_uri
4343
run: cargo clippy -p sample_com_uri
44-
- name: Clippy sample_component_hello_world
45-
run: cargo clippy -p sample_component_hello_world
46-
- name: Clippy sample_component_json_validator
47-
run: cargo clippy -p sample_component_json_validator
48-
- name: Clippy sample_component_json_validator_client
49-
run: cargo clippy -p sample_component_json_validator_client
50-
- name: Clippy sample_component_json_validator_winrt
51-
run: cargo clippy -p sample_component_json_validator_winrt
52-
- name: Clippy sample_component_json_validator_winrt_client
53-
run: cargo clippy -p sample_component_json_validator_winrt_client
54-
- name: Clippy sample_component_json_validator_winrt_client_cpp
55-
run: cargo clippy -p sample_component_json_validator_winrt_client_cpp
5644
- name: Clippy sample_consent
5745
run: cargo clippy -p sample_consent
5846
- name: Clippy sample_core_app
@@ -87,6 +75,16 @@ jobs:
8775
run: cargo clippy -p sample_enum_windows_sys
8876
- name: Clippy sample_file_dialogs
8977
run: cargo clippy -p sample_file_dialogs
78+
- name: Clippy sample_json_validator
79+
run: cargo clippy -p sample_json_validator
80+
- name: Clippy sample_json_validator_client
81+
run: cargo clippy -p sample_json_validator_client
82+
- name: Clippy sample_json_validator_winrt
83+
run: cargo clippy -p sample_json_validator_winrt
84+
- name: Clippy sample_json_validator_winrt_client
85+
run: cargo clippy -p sample_json_validator_winrt_client
86+
- name: Clippy sample_json_validator_winrt_client_cpp
87+
run: cargo clippy -p sample_json_validator_winrt_client_cpp
9088
- name: Clippy sample_kernel_event
9189
run: cargo clippy -p sample_kernel_event
9290
- name: Clippy sample_memory_buffer

‎.github/workflows/raw-dylib.yml

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,6 @@ jobs:
6868
run: cargo test -p sample_bits --target ${{ matrix.target }} ${{ matrix.etc }}
6969
- name: Test sample_com_uri
7070
run: cargo test -p sample_com_uri --target ${{ matrix.target }} ${{ matrix.etc }}
71-
- name: Test sample_component_hello_world
72-
run: cargo test -p sample_component_hello_world --target ${{ matrix.target }} ${{ matrix.etc }}
73-
- name: Test sample_component_json_validator
74-
run: cargo test -p sample_component_json_validator --target ${{ matrix.target }} ${{ matrix.etc }}
75-
- name: Test sample_component_json_validator_client
76-
run: cargo test -p sample_component_json_validator_client --target ${{ matrix.target }} ${{ matrix.etc }}
77-
- name: Test sample_component_json_validator_winrt
78-
run: cargo test -p sample_component_json_validator_winrt --target ${{ matrix.target }} ${{ matrix.etc }}
79-
- name: Test sample_component_json_validator_winrt_client
80-
run: cargo test -p sample_component_json_validator_winrt_client --target ${{ matrix.target }} ${{ matrix.etc }}
81-
- name: Test sample_component_json_validator_winrt_client_cpp
82-
run: cargo test -p sample_component_json_validator_winrt_client_cpp --target ${{ matrix.target }} ${{ matrix.etc }}
8371
- name: Test sample_consent
8472
run: cargo test -p sample_consent --target ${{ matrix.target }} ${{ matrix.etc }}
8573
- name: Test sample_core_app
@@ -114,6 +102,16 @@ jobs:
114102
run: cargo test -p sample_enum_windows_sys --target ${{ matrix.target }} ${{ matrix.etc }}
115103
- name: Test sample_file_dialogs
116104
run: cargo test -p sample_file_dialogs --target ${{ matrix.target }} ${{ matrix.etc }}
105+
- name: Test sample_json_validator
106+
run: cargo test -p sample_json_validator --target ${{ matrix.target }} ${{ matrix.etc }}
107+
- name: Test sample_json_validator_client
108+
run: cargo test -p sample_json_validator_client --target ${{ matrix.target }} ${{ matrix.etc }}
109+
- name: Test sample_json_validator_winrt
110+
run: cargo test -p sample_json_validator_winrt --target ${{ matrix.target }} ${{ matrix.etc }}
111+
- name: Test sample_json_validator_winrt_client
112+
run: cargo test -p sample_json_validator_winrt_client --target ${{ matrix.target }} ${{ matrix.etc }}
113+
- name: Test sample_json_validator_winrt_client_cpp
114+
run: cargo test -p sample_json_validator_winrt_client_cpp --target ${{ matrix.target }} ${{ matrix.etc }}
117115
- name: Test sample_kernel_event
118116
run: cargo test -p sample_kernel_event --target ${{ matrix.target }} ${{ matrix.etc }}
119117
- name: Test sample_memory_buffer
@@ -160,10 +158,10 @@ jobs:
160158
run: cargo test -p test_alternate_success_code --target ${{ matrix.target }} ${{ matrix.etc }}
161159
- name: Test test_arch
162160
run: cargo test -p test_arch --target ${{ matrix.target }} ${{ matrix.etc }}
163-
- name: Clean
164-
run: cargo clean
165161
- name: Test test_arch_feature
166162
run: cargo test -p test_arch_feature --target ${{ matrix.target }} ${{ matrix.etc }}
163+
- name: Clean
164+
run: cargo clean
167165
- name: Test test_array
168166
run: cargo test -p test_array --target ${{ matrix.target }} ${{ matrix.etc }}
169167
- name: Test test_async
@@ -262,10 +260,10 @@ jobs:
262260
run: cargo test -p test_readme --target ${{ matrix.target }} ${{ matrix.etc }}
263261
- name: Test test_ref_params
264262
run: cargo test -p test_ref_params --target ${{ matrix.target }} ${{ matrix.etc }}
265-
- name: Clean
266-
run: cargo clean
267263
- name: Test test_reference
268264
run: cargo test -p test_reference --target ${{ matrix.target }} ${{ matrix.etc }}
265+
- name: Clean
266+
run: cargo clean
269267
- name: Test test_reference_client
270268
run: cargo test -p test_reference_client --target ${{ matrix.target }} ${{ matrix.etc }}
271269
- name: Test test_reference_float
@@ -364,8 +362,6 @@ jobs:
364362
run: cargo test -p windows_x86_64_gnu --target ${{ matrix.target }} ${{ matrix.etc }}
365363
- name: Test windows_x86_64_gnullvm
366364
run: cargo test -p windows_x86_64_gnullvm --target ${{ matrix.target }} ${{ matrix.etc }}
367-
- name: Clean
368-
run: cargo clean
369365
- name: Test windows_x86_64_msvc
370366
run: cargo test -p windows_x86_64_msvc --target ${{ matrix.target }} ${{ matrix.etc }}
371367
- name: Check diff

‎.github/workflows/test.yml

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,6 @@ jobs:
6565
run: cargo test -p sample_bits --target ${{ matrix.target }} ${{ matrix.etc }}
6666
- name: Test sample_com_uri
6767
run: cargo test -p sample_com_uri --target ${{ matrix.target }} ${{ matrix.etc }}
68-
- name: Test sample_component_hello_world
69-
run: cargo test -p sample_component_hello_world --target ${{ matrix.target }} ${{ matrix.etc }}
70-
- name: Test sample_component_json_validator
71-
run: cargo test -p sample_component_json_validator --target ${{ matrix.target }} ${{ matrix.etc }}
72-
- name: Test sample_component_json_validator_client
73-
run: cargo test -p sample_component_json_validator_client --target ${{ matrix.target }} ${{ matrix.etc }}
74-
- name: Test sample_component_json_validator_winrt
75-
run: cargo test -p sample_component_json_validator_winrt --target ${{ matrix.target }} ${{ matrix.etc }}
76-
- name: Test sample_component_json_validator_winrt_client
77-
run: cargo test -p sample_component_json_validator_winrt_client --target ${{ matrix.target }} ${{ matrix.etc }}
78-
- name: Test sample_component_json_validator_winrt_client_cpp
79-
run: cargo test -p sample_component_json_validator_winrt_client_cpp --target ${{ matrix.target }} ${{ matrix.etc }}
8068
- name: Test sample_consent
8169
run: cargo test -p sample_consent --target ${{ matrix.target }} ${{ matrix.etc }}
8270
- name: Test sample_core_app
@@ -111,6 +99,16 @@ jobs:
11199
run: cargo test -p sample_enum_windows_sys --target ${{ matrix.target }} ${{ matrix.etc }}
112100
- name: Test sample_file_dialogs
113101
run: cargo test -p sample_file_dialogs --target ${{ matrix.target }} ${{ matrix.etc }}
102+
- name: Test sample_json_validator
103+
run: cargo test -p sample_json_validator --target ${{ matrix.target }} ${{ matrix.etc }}
104+
- name: Test sample_json_validator_client
105+
run: cargo test -p sample_json_validator_client --target ${{ matrix.target }} ${{ matrix.etc }}
106+
- name: Test sample_json_validator_winrt
107+
run: cargo test -p sample_json_validator_winrt --target ${{ matrix.target }} ${{ matrix.etc }}
108+
- name: Test sample_json_validator_winrt_client
109+
run: cargo test -p sample_json_validator_winrt_client --target ${{ matrix.target }} ${{ matrix.etc }}
110+
- name: Test sample_json_validator_winrt_client_cpp
111+
run: cargo test -p sample_json_validator_winrt_client_cpp --target ${{ matrix.target }} ${{ matrix.etc }}
114112
- name: Test sample_kernel_event
115113
run: cargo test -p sample_kernel_event --target ${{ matrix.target }} ${{ matrix.etc }}
116114
- name: Test sample_memory_buffer
@@ -157,10 +155,10 @@ jobs:
157155
run: cargo test -p test_alternate_success_code --target ${{ matrix.target }} ${{ matrix.etc }}
158156
- name: Test test_arch
159157
run: cargo test -p test_arch --target ${{ matrix.target }} ${{ matrix.etc }}
160-
- name: Clean
161-
run: cargo clean
162158
- name: Test test_arch_feature
163159
run: cargo test -p test_arch_feature --target ${{ matrix.target }} ${{ matrix.etc }}
160+
- name: Clean
161+
run: cargo clean
164162
- name: Test test_array
165163
run: cargo test -p test_array --target ${{ matrix.target }} ${{ matrix.etc }}
166164
- name: Test test_async
@@ -259,10 +257,10 @@ jobs:
259257
run: cargo test -p test_readme --target ${{ matrix.target }} ${{ matrix.etc }}
260258
- name: Test test_ref_params
261259
run: cargo test -p test_ref_params --target ${{ matrix.target }} ${{ matrix.etc }}
262-
- name: Clean
263-
run: cargo clean
264260
- name: Test test_reference
265261
run: cargo test -p test_reference --target ${{ matrix.target }} ${{ matrix.etc }}
262+
- name: Clean
263+
run: cargo clean
266264
- name: Test test_reference_client
267265
run: cargo test -p test_reference_client --target ${{ matrix.target }} ${{ matrix.etc }}
268266
- name: Test test_reference_float
@@ -361,8 +359,6 @@ jobs:
361359
run: cargo test -p windows_x86_64_gnu --target ${{ matrix.target }} ${{ matrix.etc }}
362360
- name: Test windows_x86_64_gnullvm
363361
run: cargo test -p windows_x86_64_gnullvm --target ${{ matrix.target }} ${{ matrix.etc }}
364-
- name: Clean
365-
run: cargo clean
366362
- name: Test windows_x86_64_msvc
367363
run: cargo test -p windows_x86_64_msvc --target ${{ matrix.target }} ${{ matrix.etc }}
368364
- name: Check diff

‎crates/samples/components/hello_world/Cargo.toml

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎crates/samples/components/hello_world/readme.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎crates/samples/components/hello_world/src/lib.rs

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎crates/samples/components/json_validator/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "sample_component_json_validator"
2+
name = "sample_json_validator"
33
version = "0.0.0"
44
edition = "2021"
55
publish = false

‎crates/samples/components/json_validator_client/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "sample_component_json_validator_client"
2+
name = "sample_json_validator_client"
33
version = "0.0.0"
44
edition = "2021"
55
publish = false
@@ -12,5 +12,5 @@ workspace = true
1212

1313
# TODO: this causes a warning about lack of linkage target. The point is to ensure that this binary dependency is built first but
1414
# Cargo doesn't respect cdylib targets. https://github.com/rust-lang/cargo/issues/7825
15-
[dependencies.sample_component_json_validator]
15+
[dependencies.sample_json_validator]
1616
path = "../json_validator"

‎crates/samples/components/json_validator_client/src/client.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ typedef void (__stdcall *CloseJsonValidator)(uintptr_t handle);
1111

1212
extern "C" {
1313
void __stdcall client() {
14-
auto library = LoadLibraryExW(L"sample_component_json_validator.dll", 0, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
14+
auto library = LoadLibraryExW(L"sample_json_validator.dll", 0, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
1515
assert(library != 0);
1616

1717
auto create = reinterpret_cast<CreateJsonValidator>(GetProcAddress(library, "CreateJsonValidator"));

‎crates/samples/components/json_validator_winrt/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "sample_component_json_validator_winrt"
2+
name = "sample_json_validator_winrt"
33
version = "0.0.0"
44
edition = "2021"
55
publish = false

‎crates/samples/components/json_validator_winrt_client/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "sample_component_json_validator_winrt_client"
2+
name = "sample_json_validator_winrt_client"
33
version = "0.0.0"
44
edition = "2021"
55
publish = false
@@ -18,5 +18,5 @@ workspace = true
1818

1919
# The build needs the output (.dll) of the component. This causes a warning about lack of linkage target.
2020
# Cargo doesn't understand cdylib targets. https://github.com/rust-lang/cargo/issues/7825
21-
[dependencies.sample_component_json_validator_winrt]
21+
[dependencies.sample_json_validator_winrt]
2222
path = "../json_validator_winrt"

‎crates/samples/components/json_validator_winrt_client_cpp/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "sample_component_json_validator_winrt_client_cpp"
2+
name = "sample_json_validator_winrt_client_cpp"
33
version = "0.0.0"
44
edition = "2021"
55
publish = false
@@ -15,5 +15,5 @@ workspace = true
1515

1616
# The build needs the output (.dll) of the component. This causes a warning about lack of linkage target.
1717
# Cargo doesn't understand cdylib targets. https://github.com/rust-lang/cargo/issues/7825
18-
[dependencies.sample_component_json_validator_winrt]
18+
[dependencies.sample_json_validator_winrt]
1919
path = "../json_validator_winrt"

0 commit comments

Comments
 (0)