Skip to content

Commit a97f033

Browse files
(GH-1153) Rename registry_lib to dsc-lib-registry
This change renames the `registry_lib` crate to `dsc-lib-registry`. This is to support eventual publishing of the crates. This crate is a dependency not only for the `registry` resource but also the `sshdconfig` resource. When we implement the Rust RDK, we will need to publish the library crates, and this ensures the naming is both consistent and easily discoverable. This change makes the requisite updates to cargo manifests, Rust code, and the build script.
1 parent 92d6096 commit a97f033

File tree

13 files changed

+24
-24
lines changed

13 files changed

+24
-24
lines changed

Cargo.toml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ members = [
1111
"lib/dsc-lib-pal",
1212
"resources/process",
1313
"resources/registry",
14-
"lib/registry_lib",
14+
"lib/dsc-lib-registry",
1515
"resources/runcommandonset",
1616
"lib/security_context_lib",
1717
"resources/sshdconfig",
@@ -33,7 +33,7 @@ default-members = [
3333
"lib/dsc-lib-pal",
3434
"resources/process",
3535
"resources/registry",
36-
"lib/registry_lib",
36+
"lib/dsc-lib-registry",
3737
"resources/runcommandonset",
3838
"lib/security_context_lib",
3939
"resources/sshdconfig",
@@ -57,7 +57,7 @@ Windows = [
5757
"lib/dsc-lib-pal",
5858
"resources/process",
5959
"resources/registry",
60-
"lib/registry_lib",
60+
"lib/dsc-lib-registry",
6161
"resources/runcommandonset",
6262
"lib/security_context_lib",
6363
"resources/sshdconfig",
@@ -121,7 +121,7 @@ chrono = { version = "0.4" }
121121
clap = { version = "4.5", features = ["derive"] }
122122
# dsc
123123
clap_complete = { version = "4.5" }
124-
# dsc, registry, registry_lib, sshdconfig
124+
# dsc, registry, dsc-lib-registry, sshdconfig
125125
crossterm = { version = "0.29" }
126126
# dsc
127127
ctrlc = { version = "3.5" }
@@ -147,21 +147,21 @@ os_info = { version = "3.11" }
147147
path-absolutize = { version = "3.1" }
148148
# dsc, dsc-lib
149149
regex = { version = "1.11" }
150-
# registry, registry_lib
150+
# registry, dsc-lib-registry
151151
registry = { version = "1.3" }
152152
# dsc
153153
rmcp = { version = "0.6" }
154154
# dsc-lib
155155
rt-format = { version = "0.3" }
156-
# dsc, dsc-lib, dscecho, registry, registry_lib, runcommandonset, sshdconfig
156+
# dsc, dsc-lib, dscecho, registry, dsc-lib-registry, runcommandonset, sshdconfig
157157
rust-i18n = { version = "3.1" }
158-
# dsc, dsc-lib, dscecho, registry, registry_lib, sshdconfig, dsctest, test_group_resource
158+
# dsc, dsc-lib, dscecho, registry, dsc-lib-registry, sshdconfig, dsctest, test_group_resource
159159
schemars = { version = "1.0", features = ["preserve_order"] }
160160
# dsc, dsc-lib
161161
semver = { version = "1.0" }
162-
# dsc, dsc-lib, dscecho, dsc-lib-osinfo, process, registry, registry_lib, runcommandonset, sshdconfig, dsctest, test_group_resource
162+
# dsc, dsc-lib, dscecho, dsc-lib-osinfo, process, registry, dsc-lib-registry, runcommandonset, sshdconfig, dsctest, test_group_resource
163163
serde = { version = "1.0", features = ["derive"] }
164-
# dsc, dsc-lib, dscecho, dsc-lib-osinfo, osinfo, process, registry, registry_lib, runcommandonset, sshdconfig, dsctest, test_group_resource, y2j
164+
# dsc, dsc-lib, dscecho, dsc-lib-osinfo, osinfo, process, registry, dsc-lib-registry, runcommandonset, sshdconfig, dsctest, test_group_resource, y2j
165165
serde_json = { version = "1.0", features = ["preserve_order"] }
166166
# dsc, dsc-lib, y2j
167167
serde_yaml = { version = "0.9" }
@@ -171,41 +171,41 @@ syntect = { version = "5.0", features = ["default-fancy"], default-features = fa
171171
sysinfo = { version = "0.37" }
172172
# sshdconfig
173173
tempfile = { version = "3.22" }
174-
# dsc, dsc-lib, registry, registry_lib, sshdconfig
174+
# dsc, dsc-lib, registry, dsc-lib-registry, sshdconfig
175175
thiserror = { version = "2.0" }
176176
# dsc, dsc-lib
177177
tokio = { version = "1.47" }
178178
# dsc
179179
tokio-util = { version = "0.7" }
180-
# dsc, dsc-lib, registry, registry_lib, runcommandonset, sshdconfig
180+
# dsc, dsc-lib, registry, dsc-lib-registry, runcommandonset, sshdconfig
181181
tracing = { version = "0.1" }
182182
# dsc, dsc-lib
183183
tracing-indicatif = { version = "0.3" }
184-
# dsc, registry, registry_lib, runcommandonset, sshdconfig
184+
# dsc, registry, dsc-lib-registry, runcommandonset, sshdconfig
185185
tracing-subscriber = { version = "0.3", features = ["ansi", "env-filter", "json"] }
186186
# dsc-lib, sshdconfig, tree-sitter-dscexpression, tree-sitter-ssh-server-config
187187
tree-sitter = { version = "0.25" }
188188
# tree-sitter-dscexpression, tree-sitter-ssh-server-config
189189
tree-sitter-language = { version = "0.1" }
190190
# dsc-lib, sshdconfig, tree-sitter-dscexpression, tree-sitter-ssh-server-config
191191
tree-sitter-rust = { version = "0.24" }
192-
# registry, registry_lib
192+
# registry, dsc-lib-registry
193193
utfx = { version = "0.1" }
194194
# dsc-lib
195195
uuid = { version = "1.18", features = ["v4"] }
196196
# dsc-lib
197197
which = { version = "8.0" }
198198

199199
# build-only dependencies
200-
# dsc-lib, registry_lib, sshdconfig, tree-sitter-dscexpression, tree-sitter-ssh-server-config
200+
# dsc-lib, dsc-lib-registry, sshdconfig, tree-sitter-dscexpression, tree-sitter-ssh-server-config
201201
cc = { version = "1.2" }
202-
# registry, registry_lib
202+
# registry, dsc-lib-registry
203203
static_vcruntime = { version = "2.0" }
204204

205205
# Workspace crates as dependencies
206206
dsc-lib = { path = "lib/dsc-lib" }
207207
dsc-lib-osinfo = { path = "lib/dsc-lib-osinfo" }
208208
security_context_lib = { path = "lib/security_context_lib" }
209209
tree-sitter-dscexpression = { path = "grammars/tree-sitter-dscexpression" }
210-
registry_lib = { path = "lib/registry_lib" }
210+
dsc-lib-registry = { path = "lib/dsc-lib-registry" }
211211
tree-sitter-ssh-server-config = { path = "grammars/tree-sitter-ssh-server-config" }

build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ if (!$SkipBuild) {
347347
New-Item -ItemType Directory $target -ErrorAction Ignore > $null
348348

349349
# make sure dependencies are built first so clippy runs correctly
350-
$windows_projects = @("lib/dsc-lib-pal", "lib/registry_lib", "resources/registry", "resources/reboot_pending", "adapters/wmi", "configurations/windows", 'extensions/appx')
350+
$windows_projects = @("lib/dsc-lib-pal", "lib/dsc-lib-registry", "resources/registry", "resources/reboot_pending", "adapters/wmi", "configurations/windows", 'extensions/appx')
351351
$macOS_projects = @("resources/brew")
352352
$linux_projects = @("resources/apt")
353353

lib/registry_lib/Cargo.toml renamed to lib/dsc-lib-registry/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "registry_lib"
2+
name = "dsc-lib-registry"
33
version = "0.1.0"
44
edition = "2021"
55

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

resources/registry/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ tracing = { workspace = true }
2222
tracing-subscriber = { workspace = true }
2323
utfx = { workspace = true }
2424
# workspace crate dependencies
25-
registry_lib = { workspace = true }
25+
dsc-lib-registry = { workspace = true }
2626

2727
[build-dependencies]
2828
static_vcruntime = { workspace = true }

resources/registry/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::env;
88

99
use args::Arguments;
1010
use clap::Parser;
11-
use registry_lib::{config::Registry, RegistryHelper};
11+
use dsc_lib_registry::{config::Registry, RegistryHelper};
1212
use rust_i18n::t;
1313
use schemars::schema_for;
1414
use std::process::exit;

resources/sshdconfig/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ tree-sitter-rust = { workspace = true}
2222
tree-sitter-ssh-server-config = { workspace = true }
2323

2424
[target.'cfg(windows)'.dependencies]
25-
registry_lib = { workspace = true }
25+
dsc-lib-registry = { workspace = true }
2626

2727
[build-dependencies]
2828
cc = { workspace = true }

0 commit comments

Comments
 (0)