Browse Source

rust: bump msrv

Philipp Schuster 1 year ago
parent
commit
5438b8d4a3

+ 2 - 2
.github/workflows/integrationtest.yml

@@ -9,7 +9,7 @@
 name: "Integration Test"
 name: "Integration Test"
 
 
 # Run on every push (tag, branch) and pull_request
 # Run on every push (tag, branch) and pull_request
-on: [pull_request, push, merge_group]
+on: [ pull_request, push, merge_group ]
 
 
 env:
 env:
   CARGO_TERM_COLOR: always
   CARGO_TERM_COLOR: always
@@ -27,7 +27,7 @@ jobs:
           # This channel is only required to invoke "nix-shell".
           # This channel is only required to invoke "nix-shell".
           # Everything inside that nix-shell will use a pinned version of
           # Everything inside that nix-shell will use a pinned version of
           # nixpkgs.
           # nixpkgs.
-          nix_path: nixpkgs=channel:nixos-23.05
+          nix_path: nixpkgs=channel:nixos-23.11
       - uses: DeterminateSystems/magic-nix-cache-action@main
       - uses: DeterminateSystems/magic-nix-cache-action@main
       - name: Set up cargo cache
       - name: Set up cargo cache
         uses: actions/cache@v4
         uses: actions/cache@v4

+ 4 - 4
.github/workflows/rust.yml

@@ -9,7 +9,7 @@
 name: "Cargo workspace"
 name: "Cargo workspace"
 
 
 # Run on every push (tag, branch) and pull_request
 # Run on every push (tag, branch) and pull_request
-on: [pull_request, push, workflow_dispatch, merge_group]
+on: [ pull_request, push, workflow_dispatch, merge_group ]
 
 
 env:
 env:
   CARGO_TERM_COLOR: always
   CARGO_TERM_COLOR: always
@@ -20,7 +20,7 @@ jobs:
     name: build (msrv)
     name: build (msrv)
     uses: ./.github/workflows/_build-rust.yml
     uses: ./.github/workflows/_build-rust.yml
     with:
     with:
-      rust-version: 1.69.0 # MSRV
+      rust-version: 1.70.0 # MSRV
       do-style-check: false
       do-style-check: false
       features: builder
       features: builder
 
 
@@ -46,7 +46,7 @@ jobs:
     needs: build_msrv
     needs: build_msrv
     uses: ./.github/workflows/_build-rust.yml
     uses: ./.github/workflows/_build-rust.yml
     with:
     with:
-      rust-version: 1.69.0 # MSRV
+      rust-version: 1.70.0 # MSRV
       do-style-check: false
       do-style-check: false
       rust-target: thumbv7em-none-eabihf
       rust-target: thumbv7em-none-eabihf
       features: builder
       features: builder
@@ -103,7 +103,7 @@ jobs:
     needs: build_msrv
     needs: build_msrv
     uses: ./.github/workflows/_build-rust.yml
     uses: ./.github/workflows/_build-rust.yml
     with:
     with:
-      rust-version: 1.69.0 # MSRV
+      rust-version: 1.70.0 # MSRV
       do-style-check: true
       do-style-check: true
       do-test: false
       do-test: false
       features: builder
       features: builder

+ 1 - 1
multiboot2-header/Cargo.toml

@@ -26,7 +26,7 @@ readme = "README.md"
 homepage = "https://github.com/rust-osdev/multiboot2-header"
 homepage = "https://github.com/rust-osdev/multiboot2-header"
 repository = "https://github.com/rust-osdev/multiboot2"
 repository = "https://github.com/rust-osdev/multiboot2"
 documentation = "https://docs.rs/multiboot2-header"
 documentation = "https://docs.rs/multiboot2-header"
-rust-version = "1.69"
+rust-version = "1.70"
 
 
 [[example]]
 [[example]]
 name = "minimal"
 name = "minimal"

+ 1 - 1
multiboot2-header/Changelog.md

@@ -3,7 +3,7 @@
 ## Unreleased
 ## Unreleased
 
 
 - added `EndHeaderTag::default()`
 - added `EndHeaderTag::default()`
-- MSRV is 1.69
+- MSRV is 1.70
 - Can add multiple `TagType::Smbios` tags in the builder.
 - Can add multiple `TagType::Smbios` tags in the builder.
 
 
 ## 0.3.2 (2023-11-30)
 ## 0.3.2 (2023-11-30)

+ 9 - 3
multiboot2-header/README.md

@@ -1,4 +1,5 @@
 # multiboot2-header
 # multiboot2-header
+
 ![Build](https://github.com/rust-osdev/multiboot2/actions/workflows/rust.yml/badge.svg)
 ![Build](https://github.com/rust-osdev/multiboot2/actions/workflows/rust.yml/badge.svg)
 [![crates.io](https://img.shields.io/crates/v/multiboot2-header.svg)](https://crates.io/crates/multiboot2-header)
 [![crates.io](https://img.shields.io/crates/v/multiboot2-header.svg)](https://crates.io/crates/multiboot2-header)
 [![docs](https://docs.rs/multiboot2-header/badge.svg)](https://docs.rs/multiboot2-header/)
 [![docs](https://docs.rs/multiboot2-header/badge.svg)](https://docs.rs/multiboot2-header/)
@@ -8,6 +9,7 @@ as well as a builder to build them at runtime. This library is `no_std` and can
 be used in bootloaders.
 be used in bootloaders.
 
 
 What this library is good for:
 What this library is good for:
+
 - construct a Multiboot2 header at runtime (constructing one at build-time with
 - construct a Multiboot2 header at runtime (constructing one at build-time with
   macros is not done yet, contributions are welcome!)
   macros is not done yet, contributions are welcome!)
 - write a Multiboot2-bootloader that parses a Multiboot2-header
 - write a Multiboot2-bootloader that parses a Multiboot2-header
@@ -60,20 +62,24 @@ fn main() {
 
 
 ## Example 2: Multiboot2 header as static data in Rust file
 ## Example 2: Multiboot2 header as static data in Rust file
 
 
-You can use the builder, construct a Multiboot2 header, write it to a file and include it like this:
+You can use the builder, construct a Multiboot2 header, write it to a file and
+include it like this:
+
 ```
 ```
 #[used]
 #[used]
 #[no_mangle]
 #[no_mangle]
 #[link_section = ".text.multiboot2_header"]
 #[link_section = ".text.multiboot2_header"]
 static MULTIBOOT2_HDR: [u8; 64] = *include_bytes!("mb2_hdr_dump.bin");
 static MULTIBOOT2_HDR: [u8; 64] = *include_bytes!("mb2_hdr_dump.bin");
 ```
 ```
+
 You may need a special linker script to place this symbol in the first 32768
 You may need a special linker script to place this symbol in the first 32768
 bytes of the ELF. See Multiboot2 specification.
 bytes of the ELF. See Multiboot2 specification.
 
 
 ## MSRV
 ## MSRV
 
 
-The MSRV is 1.69.0 stable.
+The MSRV is 1.70.0 stable.
 
 
 ## License & Contribution
 ## License & Contribution
 
 
-See main [README](https://github.com/rust-osdev/multiboot2/blob/main/README.md) file.
+See main [README](https://github.com/rust-osdev/multiboot2/blob/main/README.md)
+file.

+ 1 - 1
multiboot2-header/src/lib.rs

@@ -34,7 +34,7 @@
 //!
 //!
 //! ## MSRV
 //! ## MSRV
 //!
 //!
-//! The MSRV is 1.69.0 stable.
+//! The MSRV is 1.70.0 stable.
 
 
 #![no_std]
 #![no_std]
 #![cfg_attr(feature = "unstable", feature(error_in_core))]
 #![cfg_attr(feature = "unstable", feature(error_in_core))]

+ 1 - 1
multiboot2/Cargo.toml

@@ -31,7 +31,7 @@ readme = "README.md"
 homepage = "https://github.com/rust-osdev/multiboot2"
 homepage = "https://github.com/rust-osdev/multiboot2"
 repository = "https://github.com/rust-osdev/multiboot2"
 repository = "https://github.com/rust-osdev/multiboot2"
 documentation = "https://docs.rs/multiboot2"
 documentation = "https://docs.rs/multiboot2"
-rust-version = "1.69"
+rust-version = "1.70"
 
 
 [features]
 [features]
 default = ["builder"]
 default = ["builder"]

+ 1 - 1
multiboot2/Changelog.md

@@ -3,7 +3,7 @@
 ## Unreleased
 ## Unreleased
 
 
 - added `InformationBuilder::default()`
 - added `InformationBuilder::default()`
-- MSRV is 1.69
+- MSRV is 1.70
 
 
 ## 0.19.0 (2023-09-21)
 ## 0.19.0 (2023-09-21)
 
 

+ 23 - 15
multiboot2/README.md

@@ -1,4 +1,5 @@
 # multiboot2
 # multiboot2
+
 ![Build](https://github.com/rust-osdev/multiboot2/actions/workflows/rust.yml/badge.svg)
 ![Build](https://github.com/rust-osdev/multiboot2/actions/workflows/rust.yml/badge.svg)
 [![crates.io](https://img.shields.io/crates/v/multiboot2.svg)](https://crates.io/crates/multiboot2)
 [![crates.io](https://img.shields.io/crates/v/multiboot2.svg)](https://crates.io/crates/multiboot2)
 [![docs](https://docs.rs/multiboot2/badge.svg)](https://docs.rs/multiboot2/)
 [![docs](https://docs.rs/multiboot2/badge.svg)](https://docs.rs/multiboot2/)
@@ -8,9 +9,12 @@ Multiboot2-compliant bootloaders, such as GRUB. It supports all tags from the
 specification including full support for the sections of ELF files. This library
 specification including full support for the sections of ELF files. This library
 is `no_std` and can be used in a Multiboot2-kernel.
 is `no_std` and can be used in a Multiboot2-kernel.
 
 
-It follows the Multiboot 2.0 specification at https://www.gnu.org/software/grub/manual/multiboot2/multiboot.html and the ELF 64 specification at http://www.uclibc.org/docs/elf-64-gen.pdf.
+It follows the Multiboot 2.0 specification
+at https://www.gnu.org/software/grub/manual/multiboot2/multiboot.html and the
+ELF 64 specification at http://www.uclibc.org/docs/elf-64-gen.pdf.
 
 
 ## Features and `no_std` Compatibility
 ## Features and `no_std` Compatibility
+
 This library is always `no_std` without `alloc`. However, the default `builder`-
 This library is always `no_std` without `alloc`. However, the default `builder`-
 feature requires the `alloc`-crate and an `#[global_allocator]` to be available.
 feature requires the `alloc`-crate and an `#[global_allocator]` to be available.
 You need the `builder` only if you want to construct new boot information
 You need the `builder` only if you want to construct new boot information
@@ -18,28 +22,32 @@ structures at runtime. For parsing, this is not relevant, and you can
 deactivate the default feature.
 deactivate the default feature.
 
 
 ## Background: The Multiboot 2 Information Structure
 ## Background: The Multiboot 2 Information Structure
+
 The Multiboot information structure looks like this:
 The Multiboot information structure looks like this:
 
 
-Field            | Type
----------------- | -----------
-total size       | u32
-reserved         | u32
-tags             | variable
-end tag = (0, 8) | (u32, u32)
+ Field            | Type
+------------------|------------
+ total size       | u32
+ reserved         | u32
+ tags             | variable
+ end tag = (0, 8) | (u32, u32)
 
 
 There are many different types of tags, but they all have the same beginning:
 There are many different types of tags, but they all have the same beginning:
 
 
-Field         | Type
-------------- | -----------------
-type          | u32
-size          | u32
-other fields  | variable
+ Field        | Type
+--------------|----------
+ type         | u32
+ size         | u32
+ other fields | variable
 
 
-All tags and the mbi itself are 8-byte aligned. The last tag must be the _end tag_, which is a tag of type `0` and size `8`.
+All tags and the mbi itself are 8-byte aligned. The last tag must be the _end
+tag_, which is a tag of type `0` and size `8`.
 
 
 ## MSRV
 ## MSRV
-The MSRV is 1.69.0 stable.
+
+The MSRV is 1.70.0 stable.
 
 
 ## License & Contribution
 ## License & Contribution
 
 
-See main [README](https://github.com/rust-osdev/multiboot2/blob/main/README.md) file.
+See main [README](https://github.com/rust-osdev/multiboot2/blob/main/README.md)
+file.

+ 1 - 1
multiboot2/src/lib.rs

@@ -33,7 +33,7 @@
 //! ```
 //! ```
 //!
 //!
 //! ## MSRV
 //! ## MSRV
-//! The MSRV is 1.69.0 stable.
+//! The MSRV is 1.70.0 stable.
 
 
 #[cfg(feature = "builder")]
 #[cfg(feature = "builder")]
 extern crate alloc;
 extern crate alloc;