Merge #381

381: Omit implicit core,alloc from build-std r=mkroening a=mkroening



Co-authored-by: Martin Kröning <mkroening@posteo.net>

.github/workflows/ci.yml

@@ -62,7 +62,7 @@ jobs:
       with:
          submodules: true
     - name: Build dev profile
-      run: cargo build -Zbuild-std=core,alloc,std,panic_abort --target x86_64-unknown-hermit --package rusty_demo
+      run: cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --package rusty_demo
     - name: Install uhyve
       run: cargo install --locked uhyve
     - name: Check KVM availability
@@ -75,7 +75,7 @@ jobs:
       env:
         RUST_LOG: debug
     - name: Build release profile
-      run: cargo build -Zbuild-std=core,alloc,std,panic_abort --target x86_64-unknown-hermit --package rusty_demo --release
+      run: cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --package rusty_demo --release
     - name: Test release version
       run: uhyve --verbose -c 1 target/x86_64-unknown-hermit/release/rusty_demo
       env:
@@ -93,7 +93,7 @@ jobs:
         with:
           submodules: true
       - name: Build dev profile
-        run: cargo build -Zbuild-std=core,alloc,std,panic_abort --target x86_64-unknown-hermit --package rusty_demo
+        run: cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --package rusty_demo
       - name: Download loader
         uses: dsaltares/fetch-gh-release-asset@1.1.0
         with:
@@ -107,7 +107,7 @@ jobs:
             -initrd target/x86_64-unknown-hermit/debug/rusty_demo
       - name: Build release profile
         run:
-          cargo build -Zbuild-std=core,alloc,std,panic_abort --target x86_64-unknown-hermit --package rusty_demo --release
+          cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --package rusty_demo --release
       - name: Test release profile
         run: |
           qemu-system-x86_64 -display none -smp 1 -m 128M -serial stdio \
@@ -116,7 +116,7 @@ jobs:
             -initrd target/x86_64-unknown-hermit/release/rusty_demo
       - name: Build httpd with DHCP support
         run:
-          cargo build -Zbuild-std=core,alloc,std,panic_abort --target x86_64-unknown-hermit --package httpd --features ci,dhcpv4
+          cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --package httpd --features ci,dhcpv4
       - name: Test httpd with DHCP support
         run: |
           qemu-system-x86_64 -smp 1 -cpu qemu64,apic,fsgsbase,rdtscp,xsave,xsaveopt,fxsr,rdrand \
@@ -130,4 +130,4 @@ jobs:
             sleep 1
       - name: Build httpd without DHCP support
         run:
-          cargo build -Zbuild-std=core,alloc,std,panic_abort --target x86_64-unknown-hermit --package httpd
+          cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --package httpd

.github/workflows/publish.yml

@@ -28,7 +28,7 @@ jobs:
         username: hermitcore
         password: ${{ secrets.GITHUB_TOKEN }}
     - name: Build demo
-      run: cargo build -Zbuild-std=core,alloc,std,panic_abort --target x86_64-unknown-hermit --no-default-features -p rusty_demo --release
+      run: cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --no-default-features -p rusty_demo --release
     - name: Copy demo out of target dir
       run: cp target/x86_64-unknown-hermit/release/rusty_demo .
     - name: Download loader

.github/workflows/publish_docs.yml

@@ -23,7 +23,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install nasm
       - name: Generate documentation
-        run: cargo doc -Zbuild-std=core,alloc,std,panic_abort --target x86_64-unknown-hermit
+        run: cargo doc -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit
       - name: Generate index.html
         run: |
           cat > target/x86_64-unknown-hermit/doc/index.html <<EOL

.gitlab-ci.yml

@@ -32,8 +32,8 @@ build:demo:
   stage: build
   image: ${DOCKER_IMAGE}:${DOCKER_TAG}
   script:
-    - cargo build -Zbuild-std=core,alloc,std,panic_abort --target x86_64-unknown-hermit --package rusty_demo
-    - cargo build -Zbuild-std=core,alloc,std,panic_abort --target x86_64-unknown-hermit --package rusty_demo --release
+    - cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --package rusty_demo
+    - cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --package rusty_demo --release
   artifacts:
     paths:
       - target/x86_64-unknown-hermit/debug/rusty_demo
@@ -43,7 +43,7 @@ build:httpd:
   stage: build
   image: ${DOCKER_IMAGE}:${DOCKER_TAG}
   script:
-    - cargo build -Zbuild-std=core,alloc,std,panic_abort --target x86_64-unknown-hermit --manifest-path examples/httpd/Cargo.toml --no-default-features --features pci,acpi,tcp,vga,dhcpv4 --release
+    - cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --manifest-path examples/httpd/Cargo.toml --no-default-features --features pci,acpi,tcp,vga,dhcpv4 --release
   artifacts:
     paths:
       - target/x86_64-unknown-hermit/release/httpd
@@ -52,7 +52,7 @@ build:httpd_mvm:
   stage: build
   image: ${DOCKER_IMAGE}:${DOCKER_TAG}
   script:
-    - cargo build -Zbuild-std=core,alloc,std,panic_abort --target x86_64-unknown-hermit --manifest-path examples/httpd/Cargo.toml --no-default-features --features tcp,dhcpv4 --release
+    - cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --manifest-path examples/httpd/Cargo.toml --no-default-features --features tcp,dhcpv4 --release
   artifacts:
     paths:
       - target/x86_64-unknown-hermit/release/httpd