Skip to content

Commit 5438b8d

Browse files
committed
rust: bump msrv
1 parent 6041120 commit 5438b8d

File tree

10 files changed

+44
-30
lines changed

10 files changed

+44
-30
lines changed

.github/workflows/integrationtest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
name: "Integration Test"
1010

1111
# Run on every push (tag, branch) and pull_request
12-
on: [pull_request, push, merge_group]
12+
on: [ pull_request, push, merge_group ]
1313

1414
env:
1515
CARGO_TERM_COLOR: always
@@ -27,7 +27,7 @@ jobs:
2727
# This channel is only required to invoke "nix-shell".
2828
# Everything inside that nix-shell will use a pinned version of
2929
# nixpkgs.
30-
nix_path: nixpkgs=channel:nixos-23.05
30+
nix_path: nixpkgs=channel:nixos-23.11
3131
- uses: DeterminateSystems/magic-nix-cache-action@main
3232
- name: Set up cargo cache
3333
uses: actions/cache@v4

.github/workflows/rust.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
name: "Cargo workspace"
1010

1111
# Run on every push (tag, branch) and pull_request
12-
on: [pull_request, push, workflow_dispatch, merge_group]
12+
on: [ pull_request, push, workflow_dispatch, merge_group ]
1313

1414
env:
1515
CARGO_TERM_COLOR: always
@@ -20,7 +20,7 @@ jobs:
2020
name: build (msrv)
2121
uses: ./.github/workflows/_build-rust.yml
2222
with:
23-
rust-version: 1.69.0 # MSRV
23+
rust-version: 1.70.0 # MSRV
2424
do-style-check: false
2525
features: builder
2626

@@ -46,7 +46,7 @@ jobs:
4646
needs: build_msrv
4747
uses: ./.github/workflows/_build-rust.yml
4848
with:
49-
rust-version: 1.69.0 # MSRV
49+
rust-version: 1.70.0 # MSRV
5050
do-style-check: false
5151
rust-target: thumbv7em-none-eabihf
5252
features: builder
@@ -103,7 +103,7 @@ jobs:
103103
needs: build_msrv
104104
uses: ./.github/workflows/_build-rust.yml
105105
with:
106-
rust-version: 1.69.0 # MSRV
106+
rust-version: 1.70.0 # MSRV
107107
do-style-check: true
108108
do-test: false
109109
features: builder

multiboot2-header/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ readme = "README.md"
2626
homepage = "https://github.com/rust-osdev/multiboot2-header"
2727
repository = "https://github.com/rust-osdev/multiboot2"
2828
documentation = "https://docs.rs/multiboot2-header"
29-
rust-version = "1.69"
29+
rust-version = "1.70"
3030

3131
[[example]]
3232
name = "minimal"

multiboot2-header/Changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Unreleased
44

55
- added `EndHeaderTag::default()`
6-
- MSRV is 1.69
6+
- MSRV is 1.70
77
- Can add multiple `TagType::Smbios` tags in the builder.
88

99
## 0.3.2 (2023-11-30)

multiboot2-header/README.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# multiboot2-header
2+
23
![Build](https://github.com/rust-osdev/multiboot2/actions/workflows/rust.yml/badge.svg)
34
[![crates.io](https://img.shields.io/crates/v/multiboot2-header.svg)](https://crates.io/crates/multiboot2-header)
45
[![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
89
be used in bootloaders.
910

1011
What this library is good for:
12+
1113
- construct a Multiboot2 header at runtime (constructing one at build-time with
1214
macros is not done yet, contributions are welcome!)
1315
- write a Multiboot2-bootloader that parses a Multiboot2-header
@@ -60,20 +62,24 @@ fn main() {
6062

6163
## Example 2: Multiboot2 header as static data in Rust file
6264

63-
You can use the builder, construct a Multiboot2 header, write it to a file and include it like this:
65+
You can use the builder, construct a Multiboot2 header, write it to a file and
66+
include it like this:
67+
6468
```
6569
#[used]
6670
#[no_mangle]
6771
#[link_section = ".text.multiboot2_header"]
6872
static MULTIBOOT2_HDR: [u8; 64] = *include_bytes!("mb2_hdr_dump.bin");
6973
```
74+
7075
You may need a special linker script to place this symbol in the first 32768
7176
bytes of the ELF. See Multiboot2 specification.
7277

7378
## MSRV
7479

75-
The MSRV is 1.69.0 stable.
80+
The MSRV is 1.70.0 stable.
7681

7782
## License & Contribution
7883

79-
See main [README](https://github.com/rust-osdev/multiboot2/blob/main/README.md) file.
84+
See main [README](https://github.com/rust-osdev/multiboot2/blob/main/README.md)
85+
file.

multiboot2-header/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
//!
3535
//! ## MSRV
3636
//!
37-
//! The MSRV is 1.69.0 stable.
37+
//! The MSRV is 1.70.0 stable.
3838
3939
#![no_std]
4040
#![cfg_attr(feature = "unstable", feature(error_in_core))]

multiboot2/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ readme = "README.md"
3131
homepage = "https://github.com/rust-osdev/multiboot2"
3232
repository = "https://github.com/rust-osdev/multiboot2"
3333
documentation = "https://docs.rs/multiboot2"
34-
rust-version = "1.69"
34+
rust-version = "1.70"
3535

3636
[features]
3737
default = ["builder"]

multiboot2/Changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Unreleased
44

55
- added `InformationBuilder::default()`
6-
- MSRV is 1.69
6+
- MSRV is 1.70
77

88
## 0.19.0 (2023-09-21)
99

multiboot2/README.md

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# multiboot2
2+
23
![Build](https://github.com/rust-osdev/multiboot2/actions/workflows/rust.yml/badge.svg)
34
[![crates.io](https://img.shields.io/crates/v/multiboot2.svg)](https://crates.io/crates/multiboot2)
45
[![docs](https://docs.rs/multiboot2/badge.svg)](https://docs.rs/multiboot2/)
@@ -8,38 +9,45 @@ Multiboot2-compliant bootloaders, such as GRUB. It supports all tags from the
89
specification including full support for the sections of ELF files. This library
910
is `no_std` and can be used in a Multiboot2-kernel.
1011

11-
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.
12+
It follows the Multiboot 2.0 specification
13+
at https://www.gnu.org/software/grub/manual/multiboot2/multiboot.html and the
14+
ELF 64 specification at http://www.uclibc.org/docs/elf-64-gen.pdf.
1215

1316
## Features and `no_std` Compatibility
17+
1418
This library is always `no_std` without `alloc`. However, the default `builder`-
1519
feature requires the `alloc`-crate and an `#[global_allocator]` to be available.
1620
You need the `builder` only if you want to construct new boot information
1721
structures at runtime. For parsing, this is not relevant, and you can
1822
deactivate the default feature.
1923

2024
## Background: The Multiboot 2 Information Structure
25+
2126
The Multiboot information structure looks like this:
2227

23-
Field | Type
24-
---------------- | -----------
25-
total size | u32
26-
reserved | u32
27-
tags | variable
28-
end tag = (0, 8) | (u32, u32)
28+
Field | Type
29+
------------------|------------
30+
total size | u32
31+
reserved | u32
32+
tags | variable
33+
end tag = (0, 8) | (u32, u32)
2934

3035
There are many different types of tags, but they all have the same beginning:
3136

32-
Field | Type
33-
------------- | -----------------
34-
type | u32
35-
size | u32
36-
other fields | variable
37+
Field | Type
38+
--------------|----------
39+
type | u32
40+
size | u32
41+
other fields | variable
3742

38-
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`.
43+
All tags and the mbi itself are 8-byte aligned. The last tag must be the _end
44+
tag_, which is a tag of type `0` and size `8`.
3945

4046
## MSRV
41-
The MSRV is 1.69.0 stable.
47+
48+
The MSRV is 1.70.0 stable.
4249

4350
## License & Contribution
4451

45-
See main [README](https://github.com/rust-osdev/multiboot2/blob/main/README.md) file.
52+
See main [README](https://github.com/rust-osdev/multiboot2/blob/main/README.md)
53+
file.

multiboot2/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
//! ```
3434
//!
3535
//! ## MSRV
36-
//! The MSRV is 1.69.0 stable.
36+
//! The MSRV is 1.70.0 stable.
3737
3838
#[cfg(feature = "builder")]
3939
extern crate alloc;

0 commit comments

Comments
 (0)