Additional updates to Rust 1.60.0

rust-embedded · Nov 30, 2023 · 1e2f986 · 1e2f986
1 parent ce6e680
commit 1e2f986
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/riscv-rt.yaml b/.github/workflows/riscv-rt.yaml
@@ -10,8 +10,8 @@ jobs:
   build:
     strategy:
       matrix:
-        # All generated code should be running on stable now, MRSV is 1.59.0
-        toolchain: [ stable, nightly, 1.59.0 ]
+        # All generated code should be running on stable now, MRSV is 1.60.0
+        toolchain: [ stable, nightly, 1.60.0 ]
         target:
           - riscv32i-unknown-none-elf
           - riscv32imc-unknown-none-elf
@@ -41,7 +41,7 @@ jobs:
         run: RUSTFLAGS="-C link-arg=-Triscv-rt/examples/device.x" cargo build --package riscv-rt --target ${{ matrix.target }} --example ${{ matrix.example }} --features=single-hart
       - name: Build example (all features)
         run: RUSTFLAGS="-C link-arg=-Triscv-rt/examples/device.x" cargo build --package riscv-rt --target ${{ matrix.target }} --example ${{ matrix.example }} --all-features
-  
+
   # Job to check that all the builds succeeded
   build-check:
     needs:

diff --git a/.github/workflows/riscv.yaml b/.github/workflows/riscv.yaml
@@ -11,7 +11,7 @@ jobs:
   build-riscv:
     strategy:
       matrix:
-        # All generated code should be running on stable now, MRSV is 1.59.0
+        # All generated code should be running on stable now, MRSV is 1.60.0
         toolchain: [ stable, nightly, 1.60.0 ]
         target:
           - riscv32i-unknown-none-elf
@@ -35,7 +35,7 @@ jobs:
       run: cargo build --package riscv --target ${{ matrix.target }}
     - name: Build (all features)
       run: cargo build --package riscv --target ${{ matrix.target }} --all-features
-      
+
   # On MacOS, Ubuntu, and Windows, we at least make sure that the crate builds and links.
   build-others:
     strategy:
@@ -49,7 +49,7 @@ jobs:
         run: cargo build --package riscv
       - name: Build (all features)
         run: cargo build --package riscv --all-features
-  
+
   # Job to check that all the builds succeeded
   build-check:
     needs:

diff --git a/riscv-rt/README.md b/riscv-rt/README.md
@@ -11,7 +11,7 @@ This project is developed and maintained by the [RISC-V team][team].
 
 ## Minimum Supported Rust Version (MSRV)
 
-This crate is guaranteed to compile on stable Rust 1.59 and up. It *might*
+This crate is guaranteed to compile on stable Rust 1.60 and up. It *might*
 compile with older versions but that may change in any new patch release.
 
 ## License

diff --git a/riscv-rt/src/lib.rs b/riscv-rt/src/lib.rs
@@ -2,7 +2,7 @@
 //!
 //! # Minimum Supported Rust Version (MSRV)
 //!
-//! This crate is guaranteed to compile on stable Rust 1.59 and up. It *might*
+//! This crate is guaranteed to compile on stable Rust 1.60 and up. It *might*
 //! compile with older versions but that may change in any new patch release.
 //!
 //! # Features
@@ -483,14 +483,14 @@ pub unsafe extern "C" fn start_rust(a0: usize, a1: usize, a2: usize) -> ! {
             	sd      {a},0({start})
             	addi    {start},{start},8
             	bltu    {start},{end},1b
-            
+
             2: // .data zero registers
                 li      {a},0
                 li      {input},0
 
             	la      {start},_sbss
             	la      {end},_ebss
-            
+
                 bgeu    {start},{end},4f
 
             3: // .bss main loop

diff --git a/riscv/Cargo.toml b/riscv/Cargo.toml
@@ -2,7 +2,7 @@
 name = "riscv"
 version = "0.10.1"
 edition = "2021"
-rust-version = "1.59"
+rust-version = "1.60"
 repository = "https://github.com/rust-embedded/riscv"
 authors = ["The RISC-V Team <[email protected]>"]
 categories = ["embedded", "hardware-support", "no-std"]

diff --git a/riscv/src/lib.rs b/riscv/src/lib.rs
@@ -2,7 +2,7 @@
 //!
 //! # Minimum Supported Rust Version (MSRV)
 //!
-//! This crate is guaranteed to compile on stable Rust 1.59 and up. It *might*
+//! This crate is guaranteed to compile on stable Rust 1.60 and up. It *might*
 //! compile with older versions but that may change in any new patch release.
 //!
 //! # Features