treewide: nuke uefi-services

Author: phip1611

.github/workflows/release.yml

@@ -16,6 +16,6 @@ jobs:
       - uses: actions/checkout@v4
       - run: |
           cargo install auto-release
-          auto-release --condition body -p uefi-raw -p uefi-macros -p uefi -p uefi-services
+          auto-release --condition body -p uefi-raw -p uefi-macros -p uefi
         env:
           CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}

CHANGELOG.md

@@ -3,4 +3,3 @@
 * [`uefi` changelog](uefi/CHANGELOG.md)
 * [`uefi-macros` changelog](uefi-macros/CHANGELOG.md)
 * [`uefi-raw` changelog](uefi-raw/CHANGELOG.md)
-* [`uefi-services` changelog](uefi-services/CHANGELOG.md)

Cargo.lock

@@ -5,7 +5,6 @@ members = [
     "uefi",
     "uefi-macros",
     "uefi-raw",
-    "uefi-services",
     "uefi-test-runner",
     "xtask",
 ]
@@ -29,7 +28,6 @@ uguid = "2.1.0"
 uefi = { path = "uefi" }
 uefi-macros = { path = "uefi-macros" }
 uefi-raw = { path = "uefi-raw" }
-uefi-services = { path = "uefi-services" }
 
 # Enable optimization for xtask itself, not for its dependencies. This speeds up
 # OVMF prebuilt decompression without much increase in compilation time.

Cargo.toml

@@ -11,7 +11,6 @@ repository to [crates.io](https://crates.io/).
   release is performed.
 - We want git tags like `uefi-raw-v0.4.0` or `uefi-v0.25.0` for every release.
 - We want our crate dependencies published in the right order (if necessary):
-  - `uefi-services` depends on `uefi`
   - `uefi` depends on `uefi-macros` and `uefi-raw`
 
 ## How: Ways to Publish

PUBLISHING.md

@@ -4,5 +4,4 @@
 * [`uefi` crate reference](https://docs.rs/uefi)
 * [`uefi-macros` crate reference](https://docs.rs/uefi-macros)
 * [`uefi-raw` crate reference](https://docs.rs/uefi-raw)
-* [`uefi-services` crate reference](https://docs.rs/uefi-services)
 * [UEFI Specifications](https://uefi.org/specifications)

book/src/reference.md

@@ -1,3 +1,4 @@
 # uefi-services
 
-WARNING: `uefi-services` is deprecated. Functionality was moved to `uefi::helpers::init`.
+WARNING: `uefi-services` is deprecated. Functionality was moved to
+`uefi::helpers::init` in `uefi` ´v0.28.0`.

uefi-services/CHANGELOG.md

@@ -10,7 +10,6 @@ pub enum Package {
     UefiApp,
     UefiMacros,
     UefiRaw,
-    UefiServices,
     UefiTestRunner,
     Xtask,
 }
@@ -23,20 +22,14 @@ impl Package {
             Self::UefiApp => "uefi_app",
             Self::UefiMacros => "uefi-macros",
             Self::UefiRaw => "uefi-raw",
-            Self::UefiServices => "uefi-services",
             Self::UefiTestRunner => "uefi-test-runner",
             Self::Xtask => "xtask",
         }
     }
 
     /// All published packages, in the order that publishing should occur.
     pub fn published() -> Vec<Package> {
-        vec![
-            Self::UefiRaw,
-            Self::UefiMacros,
-            Self::Uefi,
-            Self::UefiServices,
-        ]
+        vec![Self::UefiRaw, Self::UefiMacros, Self::Uefi]
     }
 
     /// All the packages except for xtask.
@@ -46,7 +39,6 @@ impl Package {
             Self::UefiApp,
             Self::UefiMacros,
             Self::UefiRaw,
-            Self::UefiServices,
             Self::UefiTestRunner,
         ]
     }
@@ -60,11 +52,8 @@ pub enum Feature {
     Logger,
     PanicOnLoggerErrors,
     Unstable,
-
-    // `uefi-services` features.
     PanicHandler,
     Qemu,
-    ServicesLogger,
 
     // `uefi-test-runner` features.
     DebugSupport,
@@ -83,10 +72,8 @@ impl Feature {
             Self::Logger => "logger",
             Self::PanicOnLoggerErrors => "panic-on-logger-errors",
             Self::Unstable => "unstable",
-
-            Self::PanicHandler => "uefi-services/panic_handler",
-            Self::Qemu => "uefi-services/qemu",
-            Self::ServicesLogger => "uefi-services/logger",
+            Self::PanicHandler => "panic_handler",
+            Self::Qemu => "qemu",
 
             Self::DebugSupport => "uefi-test-runner/debug_support",
             Self::MultiProcessor => "uefi-test-runner/multi_processor",
@@ -106,8 +93,9 @@ impl Feature {
                 Self::Logger,
                 Self::PanicOnLoggerErrors,
                 Self::Unstable,
+                Self::PanicHandler,
+                Self::Qemu,
             ],
-            Package::UefiServices => vec![Self::PanicHandler, Self::Qemu, Self::ServicesLogger],
             Package::UefiTestRunner => {
                 vec![
                     Self::DebugSupport,

uefi-services/Cargo.toml

@@ -21,23 +21,22 @@ use opt::{Action, BuildOpt, ClippyOpt, DocOpt, Opt, QemuOpt, TpmVersion};
 use std::process::Command;
 use util::run_cmd;
 
+/// Builds various feature permutations that are valid for the `uefi` crate.
 fn build_feature_permutations(opt: &BuildOpt) -> Result<()> {
-    for package in [Package::Uefi, Package::UefiServices] {
-        let all_package_features = Feature::package_features(package);
-        for features in all_package_features.iter().powerset() {
-            let features = features.iter().map(|f| **f).collect();
+    let all_package_features = Feature::package_features(Package::Uefi);
+    for features in all_package_features.iter().powerset() {
+        let features = features.iter().map(|f| **f).collect();
 
-            let cargo = Cargo {
-                action: CargoAction::Build,
-                features,
-                packages: vec![package],
-                release: opt.build_mode.release,
-                target: Some(*opt.target),
-                warnings_as_errors: true,
-                target_types: TargetTypes::BinsExamplesLib,
-            };
-            run_cmd(cargo.command()?)?;
-        }
+        let cargo = Cargo {
+            action: CargoAction::Build,
+            features,
+            packages: vec![Package::Uefi],
+            release: opt.build_mode.release,
+            target: Some(*opt.target),
+            warnings_as_errors: true,
+            target_types: TargetTypes::BinsExamplesLib,
+        };
+        run_cmd(cargo.command()?)?;
     }
 
     Ok(())
@@ -195,8 +194,6 @@ fn run_host_tests(test_opt: &TestOpt) -> Result<()> {
         // features is set to no as it is not possible as as soon a #[global_allocator] is
         // registered, the Rust runtime executing the tests uses it as well.
         features: Feature::more_code(*test_opt.unstable, false),
-        // Don't test uefi-services (or the packages that depend on it)
-        // as it has lang items that conflict with `std`.
         packages,
         release: false,
         // Use the host target so that tests can run without a VM.