remove feat_os_unix_musl

Ecordonnier · Ecordonnier · commit 21d5cef15308 · 2025-04-15T12:51:55.000+02:00
After the addition of utmpx, feat_os_unix_musl is now identical to feat_os_unix and is thus not needed any more.

Signed-off-by: Etienne Cordonnier &lt;ecordonnier@snap.com&gt;
diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml
@@ -516,13 +516,13 @@ jobs:
           # - { os , target , cargo-options , features , use-cross , toolchain, skip-tests, workspace-tests }
           - { os: ubuntu-latest  , target: arm-unknown-linux-gnueabihf , features: feat_os_unix_gnueabihf , use-cross: use-cross , skip-tests: true }
           - { os: ubuntu-24.04-arm  , target: aarch64-unknown-linux-gnu   , features: feat_os_unix_gnueabihf }
-          - { os: ubuntu-latest  , target: aarch64-unknown-linux-musl  , features: feat_os_unix_musl      , use-cross: use-cross , skip-tests: true }
+          - { os: ubuntu-latest  , target: aarch64-unknown-linux-musl  , features: feat_os_unix      , use-cross: use-cross , skip-tests: true }
           # - { os: ubuntu-latest  , target: x86_64-unknown-linux-gnu    , features: feat_selinux           , use-cross: use-cross }
           - { os: ubuntu-latest  , target: i686-unknown-linux-gnu      , features: "feat_os_unix,test_risky_names", use-cross: use-cross }
-          - { os: ubuntu-latest  , target: i686-unknown-linux-musl     , features: feat_os_unix_musl      , use-cross: use-cross }
+          - { os: ubuntu-latest  , target: i686-unknown-linux-musl     , features: feat_os_unix      , use-cross: use-cross }
           - { os: ubuntu-latest  , target: x86_64-unknown-linux-gnu    , features: "feat_os_unix,test_risky_names", use-cross: use-cross }
           - { os: ubuntu-latest  , target: x86_64-unknown-linux-gnu    , features: "feat_os_unix,uudoc"   , use-cross: no, workspace-tests: true }
-          - { os: ubuntu-latest  , target: x86_64-unknown-linux-musl   , features: feat_os_unix_musl      , use-cross: use-cross }
+          - { os: ubuntu-latest  , target: x86_64-unknown-linux-musl   , features: feat_os_unix      , use-cross: use-cross }
           - { os: ubuntu-latest  , target: x86_64-unknown-redox        , features: feat_os_unix_redox     , use-cross: redoxer , skip-tests: true }
           - { os: macos-latest   , target: aarch64-apple-darwin        , features: feat_os_macos, workspace-tests: true } # M1 CPU
           - { os: macos-13       , target: x86_64-apple-darwin         , features: feat_os_macos, workspace-tests: true }
diff --git a/Cargo.toml b/Cargo.toml
@@ -149,7 +149,8 @@ feat_os_macos = [
   #
   "feat_require_unix_hostid",
 ]
-# "feat_os_unix" == set of utilities which can be built/run on modern/usual *nix platforms
+# "feat_os_unix" == set of utilities which can be built/run on modern/usual *nix platforms.
+# Also used for targets binding to the "musl" library (ref: <https://musl.libc.org/about.html>)
 feat_os_unix = [
   "feat_Tier1",
   #
@@ -171,15 +172,6 @@ feat_os_unix_gnueabihf = [
   "feat_require_unix_hostid",
   "feat_require_unix_utmpx",
 ]
-# "feat_os_unix_musl" == set of utilities which can be built/run on targets binding to the "musl" library (ref: <https://musl.libc.org/about.html>)
-feat_os_unix_musl = [
-  "feat_Tier1",
-  #
-  "feat_require_crate_cpp",
-  "feat_require_unix",
-  "feat_require_unix_hostid",
-  "feat_require_unix_utmpx",
-]
 feat_os_unix_android = [
   "feat_Tier1",
   #

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,8 @@ feat_os_macos = [`
`149`	`149`	`#`
`150`	`150`	`"feat_require_unix_hostid",`
`151`	`151`	`]`
`152`		`-# "feat_os_unix" == set of utilities which can be built/run on modern/usual *nix platforms`
	`152`	`+# "feat_os_unix" == set of utilities which can be built/run on modern/usual *nix platforms.`
	`153`	`+# Also used for targets binding to the "musl" library (ref: <https://musl.libc.org/about.html>)`
`153`	`154`	`feat_os_unix = [`
`154`	`155`	`"feat_Tier1",`
`155`	`156`	`#`
`@@ -171,15 +172,6 @@ feat_os_unix_gnueabihf = [`
`171`	`172`	`"feat_require_unix_hostid",`
`172`	`173`	`"feat_require_unix_utmpx",`
`173`	`174`	`]`
`174`		`-# "feat_os_unix_musl" == set of utilities which can be built/run on targets binding to the "musl" library (ref: <https://musl.libc.org/about.html>)`
`175`		`-feat_os_unix_musl = [`
`176`		`- "feat_Tier1",`
`177`		`- #`
`178`		`- "feat_require_crate_cpp",`
`179`		`- "feat_require_unix",`
`180`		`- "feat_require_unix_hostid",`
`181`		`- "feat_require_unix_utmpx",`
`182`		`-]`
`183`	`175`	`feat_os_unix_android = [`
`184`	`176`	`"feat_Tier1",`
`185`	`177`	`#`