feat: update toolchain version, fix error in errno

arceos-org · Jan 26, 2024 · e6e6283 · e6e6283
1 parent 77d0cfe
commit e6e6283
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: 
-        rust-toolchain: [nightly, nightly-2023-12-25]
+        rust-toolchain: [nightly, nightly-2024-01-19]
     steps:
     - uses: actions/checkout@v3
     - uses: actions-rs/toolchain@v1
@@ -34,7 +34,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         arch: [x86_64, riscv64, aarch64]
-        rust-toolchain: [nightly, nightly-2023-12-25]
+        rust-toolchain: [nightly, nightly-2024-01-19]
     steps:
     - uses: actions/checkout@v3
     - uses: actions-rs/toolchain@v1
@@ -102,7 +102,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        rust-toolchain: [nightly, nightly-2023-12-25]
+        rust-toolchain: [nightly, nightly-2024-01-19]
     steps:
     - uses: actions/checkout@v3
     - uses: actions-rs/toolchain@v1
@@ -143,7 +143,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         arch: [x86_64]
-        rust-toolchain: [nightly, nightly-2023-12-25]
+        rust-toolchain: [nightly, nightly-2024-01-19]
     steps:
     - uses: actions/checkout@v3
     - uses: actions-rs/toolchain@v1

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -3,7 +3,7 @@ name: Build & Deploy docs
 on: [push, pull_request]
 
 env:
-  rust-toolchain: nightly-2023-12-25
+  rust-toolchain: nightly-2024-01-19
 
 jobs:
   doc:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 env:
   qemu-version: 8.2.0
-  rust-toolchain: nightly-2023-12-25
+  rust-toolchain: nightly-2024-01-19
 
 jobs:
   unit-test:

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
 profile = "minimal"
-channel = "nightly-2023-12-25"
+channel = "nightly-2024-01-19"
 components = ["rust-src", "llvm-tools-preview", "rustfmt", "clippy"]
 targets = ["x86_64-unknown-none", "riscv64gc-unknown-none-elf", "aarch64-unknown-none-softfloat"]
diff --git a/ulib/axlibc/src/errno.rs b/ulib/axlibc/src/errno.rs
@@ -16,7 +16,7 @@ pub fn set_errno(code: i32) {
 /// Returns a pointer to the global errno variable.
 #[no_mangle]
 pub unsafe extern "C" fn __errno_location() -> *mut c_int {
-    &mut errno
+    core::ptr::addr_of_mut!(errno)
 }
 
 /// Returns a pointer to the string representation of the given error code.
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Build & Deploy docs @@
     on: [push, pull_request]
     env:
-      rust-toolchain: nightly-2023-12-25
+      rust-toolchain: nightly-2024-01-19
     jobs:
       doc:
@@ Expand Down @@