Skip to content

Commit 166e97e

Browse files
phip1611phip1611
committed
workspace: Rust edition 2024, bump MSRV to 1.85
1 parent e7030ae commit 166e97e

File tree

10 files changed

+67
-64
lines changed

10 files changed

+67
-64
lines changed

‎.github/workflows/rust.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
name: build (msrv)
2525
uses: ./.github/workflows/_build-rust.yml
2626
with:
27-
rust-version: 1.81.0 # MSRV
27+
rust-version: 1.85.0 # MSRV
2828
do-style-check: false
2929
features: builder
3030

@@ -50,7 +50,7 @@ jobs:
5050
needs: build_msrv
5151
uses: ./.github/workflows/_build-rust.yml
5252
with:
53-
rust-version: 1.81.0 # MSRV
53+
rust-version: 1.85.0 # MSRV
5454
do-style-check: false
5555
rust-target: thumbv7em-none-eabihf
5656
features: builder
@@ -107,7 +107,7 @@ jobs:
107107
needs: build_msrv
108108
uses: ./.github/workflows/_build-rust.yml
109109
with:
110-
rust-version: 1.81.0 # MSRV
110+
rust-version: 1.85.0 # MSRV
111111
do-style-check: true
112112
do-test: false
113113
features: builder

‎Cargo.toml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
[workspace]
22
resolver = "2"
33
members = [
4-
"multiboot2",
5-
"multiboot2-common",
6-
"multiboot2-header",
4+
"multiboot2",
5+
"multiboot2-common",
6+
"multiboot2-header",
77
]
88
exclude = [
9-
"integration-test"
9+
"integration-test"
1010
]
11+
package.rust-version = "1.85.0"
12+
package.edition = "2024"
13+
package.license = "MIT/Apache-2.0"
1114

1215
[workspace.dependencies]
1316
bitflags = "2.9.1"

‎multiboot2-common/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@ Common helpers for the `multiboot2` and `multiboot2-header` crates.
55
"""
66
version = "0.2.1"
77
authors = [
8-
"Philipp Schuster <[email protected]>"
8+
"Philipp Schuster <[email protected]>"
99
]
10-
license = "MIT/Apache-2.0"
11-
edition = "2021"
1210
categories = [
13-
"no-std",
14-
"no-std::no-alloc",
11+
"no-std",
12+
"no-std::no-alloc",
1513
]
1614
keywords = [
17-
"Multiboot2"
15+
"Multiboot2"
1816
]
1917
readme = "README.md"
2018
homepage = "https://github.com/rust-osdev/multiboot2/tree/main/multiboot2-common"
2119
repository = "https://github.com/rust-osdev/multiboot2"
2220
documentation = "https://docs.rs/multiboot2-common"
23-
rust-version = "1.75"
21+
edition.workspace = true
22+
license.workspace = true
23+
rust-version.workspace = true
2424

2525
[features]
2626
default = ["builder"]

‎multiboot2-common/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ to first study the inner box (`multiboot2-common`) and then study how types from
4646

4747
## MSRV
4848

49-
The MSRV is 1.81.0 stable.
49+
The MSRV is 1.85.0 stable.
5050

5151
## License & Contribution
5252

‎multiboot2-header/Cargo.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,28 @@ the corresponding structures.
88
"""
99
version = "0.6.0"
1010
authors = [
11-
"Philipp Schuster <[email protected]>"
11+
"Philipp Schuster <[email protected]>"
1212
]
13-
license = "MIT/Apache-2.0"
14-
edition = "2021"
1513
categories = [
16-
"no-std",
17-
"no-std::no-alloc",
18-
"parsing",
14+
"no-std",
15+
"no-std::no-alloc",
16+
"parsing",
1917
]
2018
keywords = [
21-
"Multiboot2",
22-
"kernel",
23-
"boot",
24-
"bootloader",
19+
"Multiboot2",
20+
"kernel",
21+
"boot",
22+
"bootloader",
2523
]
2624
# without this, sometimes crates.io doesn't show the preview of the README
2725
# I expeciended this multiple times in the past
2826
readme = "README.md"
2927
homepage = "https://github.com/rust-osdev/multiboot2/tree/main/multiboot2-header"
3028
repository = "https://github.com/rust-osdev/multiboot2"
3129
documentation = "https://docs.rs/multiboot2-header"
32-
rust-version = "1.75"
30+
edition.workspace = true
31+
license.workspace = true
32+
rust-version.workspace = true
3333

3434
[[example]]
3535
name = "minimal"

‎multiboot2-header/README.md

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -46,25 +46,25 @@ use multiboot2_header::{HeaderTagFlag, HeaderTagISA, MbiTagType, RelocatableHead
4646

4747
/// Small example that creates a Multiboot2 header and parses it afterwards.
4848
fn main() {
49-
// We create a Multiboot2 header during runtime here. A practical example is that your
50-
// program gets the header from a file and parses it afterwards.
51-
let mb2_hdr_bytes = Multiboot2HeaderBuilder::new(HeaderTagISA::I386)
52-
.relocatable_tag(RelocatableHeaderTag::new(
53-
HeaderTagFlag::Required,
54-
0x1337,
55-
0xdeadbeef,
56-
4096,
57-
RelocatableHeaderTagPreference::None,
58-
))
59-
.information_request_tag(
60-
InformationRequestHeaderTagBuilder::new(HeaderTagFlag::Required)
61-
.add_irs(&[MbiTagType::Cmdline, MbiTagType::BootLoaderName]),
62-
)
63-
.build();
64-
65-
// Cast bytes in vector to Multiboot2 information structure
66-
let mb2_hdr = unsafe { Multiboot2Header::from_addr(mb2_hdr_bytes.as_ptr().cast()) };
67-
println!("{:#?}", mb2_hdr);
49+
// We create a Multiboot2 header during runtime here. A practical example is that your
50+
// program gets the header from a file and parses it afterwards.
51+
let mb2_hdr_bytes = Multiboot2HeaderBuilder::new(HeaderTagISA::I386)
52+
.relocatable_tag(RelocatableHeaderTag::new(
53+
HeaderTagFlag::Required,
54+
0x1337,
55+
0xdeadbeef,
56+
4096,
57+
RelocatableHeaderTagPreference::None,
58+
))
59+
.information_request_tag(
60+
InformationRequestHeaderTagBuilder::new(HeaderTagFlag::Required)
61+
.add_irs(&[MbiTagType::Cmdline, MbiTagType::BootLoaderName]),
62+
)
63+
.build();
64+
65+
// Cast bytes in vector to Multiboot2 information structure
66+
let mb2_hdr = unsafe { Multiboot2Header::from_addr(mb2_hdr_bytes.as_ptr().cast()) };
67+
println!("{:#?}", mb2_hdr);
6868
}
6969
```
7070

@@ -85,7 +85,7 @@ bytes of the ELF. See Multiboot2 specification.
8585

8686
## MSRV
8787

88-
The MSRV is 1.81.0 stable.
88+
The MSRV is 1.85.0 stable.
8989

9090
## License & Contribution
9191

‎multiboot2-header/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
//!
2424
//! ## MSRV
2525
//!
26-
//! The MSRV is 1.81.0 stable.
26+
//! The MSRV is 1.85.0 stable.
2727
2828
#![no_std]
2929
// --- BEGIN STYLE CHECKS ---

‎multiboot2/Cargo.toml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,31 @@ the corresponding structures.
88
"""
99
version = "0.23.1"
1010
authors = [
11-
"Philipp Oppermann <[email protected]>",
12-
"Calvin Lee <[email protected]>",
13-
"Isaac Woods",
14-
"Philipp Schuster <[email protected]>"
11+
"Philipp Oppermann <[email protected]>",
12+
"Calvin Lee <[email protected]>",
13+
"Isaac Woods",
14+
"Philipp Schuster <[email protected]>"
1515
]
16-
license = "MIT/Apache-2.0"
17-
edition = "2021"
1816
categories = [
19-
"no-std",
20-
"no-std::no-alloc",
21-
"parsing",
17+
"no-std",
18+
"no-std::no-alloc",
19+
"parsing",
2220
]
2321
keywords = [
24-
"Multiboot2",
25-
"kernel",
26-
"boot",
27-
"bootloader",
22+
"Multiboot2",
23+
"kernel",
24+
"boot",
25+
"bootloader",
2826
]
2927
# without this, sometimes crates.io doesn't show the preview of the README
3028
# I expeciended this multiple times in the past
3129
readme = "README.md"
3230
homepage = "https://github.com/rust-osdev/multiboot2/tree/main/multiboot2"
3331
repository = "https://github.com/rust-osdev/multiboot2"
3432
documentation = "https://docs.rs/multiboot2"
35-
rust-version = "1.75"
33+
edition.workspace = true
34+
license.workspace = true
35+
rust-version.workspace = true
3636

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

‎multiboot2/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ There are many different types of tags, but they all have the same beginning:
4747

4848
## MSRV
4949

50-
The MSRV is 1.81.0 stable.
50+
The MSRV is 1.85.0 stable.
5151

5252
## License & Contribution
5353

‎multiboot2/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
//! ```
4242
//!
4343
//! ## MSRV
44-
//! The MSRV is 1.81.0 stable.
44+
//! The MSRV is 1.85.0 stable.
4545
4646
#[cfg_attr(feature = "builder", macro_use)]
4747
#[cfg(feature = "builder")]
@@ -114,7 +114,7 @@ pub use rsdp::{RsdpV1Tag, RsdpV2Tag};
114114
pub use smbios::SmbiosTag;
115115
pub use tag::TagHeader;
116116
pub use tag_type::{TagType, TagTypeId};
117-
pub use util::{parse_slice_as_string, StringError};
117+
pub use util::{StringError, parse_slice_as_string};
118118
pub use vbe_info::{
119119
VBECapabilities, VBEControlInfo, VBEDirectColorAttributes, VBEField, VBEInfoTag,
120120
VBEMemoryModel, VBEModeAttributes, VBEModeInfo, VBEWindowAttributes,

0 commit comments

Comments
 (0)