pixie-uefi on stable

Author: Virv12

.github/workflows/docs.yml

@@ -6,47 +6,45 @@ on:
       - master
   workflow_dispatch:
 
-env:
-  CARGO_TERM_COLOR: always
-
 jobs:
   docs:
     name: Build documentation
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Install Deps
-        run: |
-          rustup toolchain install stable nightly
-          rustup component add rust-src --toolchain nightly
-          rustup default stable
-          cargo install doc-merge
+
+      - name: Install rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          components: rustfmt, clippy
+          target: wasm32-unknown-unknown, x86_64-unknown-uefi
+          cache-workspaces: |
+            pixie-server
+            pixie-shared
+            pixie-uefi
+            pixie-web
+
+      - name: Install doc-merge
+        run: cargo install doc-merge
+
       - name: cargo doc
         run: |
           for d in pixie-*; do
             pushd $d
             cargo doc \
-              --color=always \
               --no-deps \
               --document-private-items \
               --all-features \
               --package $d \
               --package pixie-shared
+            doc-merge --src target/**/doc --dest ../doc --create-dest
             popd
           done
-      - name: Merge docs
-        run: |
-          for d in pixie-*/target/doc; do
-            doc-merge --src $d --dest doc --create-dest
-          done
-          # doc-merge does not work with nightly
-          # we merge pixie-uefi doc by hand by search is broken
-          cp -r pixie-uefi/target/x86_64-unknown-uefi/doc/static.files doc/
-          cp -r pixie-uefi/target/x86_64-unknown-uefi/doc/pixie_uefi doc/
-          echo 'window.ALL_CRATES = ["pixie_server","pixie_shared","pixie_web","pixie_uefi"];' > doc/crates.js
+
       - name: Make index.html
         run: |
           echo '<meta http-equiv="Refresh" content="0; url=./pixie_server/index.html">' > doc/index.html
+
       - name: Publish
         uses: JamesIves/github-pages-deploy-action@v4.5.0
         with:

.github/workflows/rust.yml

@@ -13,9 +13,8 @@ jobs:
       - name: Install rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable, nightly
-          components: rustfmt, clippy, rust-src
-          target: wasm32-unknown-unknown
+          components: rustfmt, clippy
+          target: wasm32-unknown-unknown, x86_64-unknown-uefi
           cache-workspaces: |
             pixie-server
             pixie-shared
@@ -47,9 +46,8 @@ jobs:
       - name: Install rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable, nightly
-          components: rustfmt, clippy, rust-src
-          target: wasm32-unknown-unknown
+          components: rustfmt, clippy
+          target: wasm32-unknown-unknown, x86_64-unknown-uefi
           cache-workspaces: |
             pixie-server
             pixie-shared

pixie-uefi/.cargo/config.toml

@@ -1,6 +1,2 @@
-[unstable]
-build-std = ["core", "compiler_builtins", "alloc"]
-build-std-features = ["compiler-builtins-mem"]
-
 [build]
 target = "x86_64-unknown-uefi"

pixie-uefi/rust-toolchain.toml

@@ -1,6 +1,5 @@
 #![no_main]
 #![no_std]
-#![feature(never_type)]
 #![deny(unused_must_use)]
 
 #[macro_use]
@@ -33,18 +32,14 @@ async fn server_discover(os: UefiOS) -> Result<SocketAddrV4> {
     let socket = os.udp_bind(None).await?;
 
     let task1 = async {
-        // TODO(virv): there must be a better way...
-        if false {
-            return Err::<!, _>(Error::Generic("".into()));
-        }
-
         let msg = postcard::to_allocvec(&UdpRequest::Discover).unwrap();
-        loop {
+        #[allow(unreachable_code)]
+        Ok::<_, Error>(loop {
             socket
                 .send(SocketAddrV4::new(Ipv4Addr::BROADCAST, ACTION_PORT), &msg)
                 .await?;
             os.sleep_us(1_000_000).await;
-        }
+        })
     };
 
     let task2 = async {
@@ -93,7 +88,7 @@ async fn complete_action(stream: &TcpStream) -> Result<()> {
     Ok(())
 }
 
-async fn run(os: UefiOS) -> Result<!> {
+async fn run(os: UefiOS) -> Result<()> {
     let server = server_discover(os).await?;
 
     let mut last_was_wait = false;

pixie-uefi/src/main.rs

@@ -157,7 +157,7 @@ impl UefiOS {
     pub fn start<F, Fut>(mut f: F) -> !
     where
         F: FnMut(UefiOS) -> Fut + 'static,
-        Fut: Future<Output = Result<!>>,
+        Fut: Future<Output = Result<()>>,
     {
         // Never call this function twice.
         assert!(OS.borrow().is_none());
@@ -215,8 +215,9 @@ impl UefiOS {
 
         os.spawn("init", async move {
             loop {
-                let err = f(os).await.unwrap_err();
-                log::error!("Error: {:?}", err);
+                if let Err(err) = f(os).await {
+                    log::error!("Error: {:?}", err);
+                }
             }
         });
 

pixie-uefi/src/os/mod.rs

@@ -0,0 +1,2 @@
+[build]
+target = "wasm32-unknown-unknown"