Skip to content

Commit d0fe1ef

Browse files
committed
clippy: apply new fixes + MSRV fix
1 parent d08e5eb commit d0fe1ef

File tree

10 files changed

+9
-9
lines changed

10 files changed

+9
-9
lines changed

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.68"
29+
rust-version = "1.69"
3030

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

multiboot2-header/Changelog.md

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

55
- added `EndHeaderTag::default()`
6+
- MSRV is 1.69
67

78
## 0.3.2 (2023-11-30)
89

@@ -17,7 +18,7 @@
1718

1819
## 0.3.0 (2023-06-23)
1920

20-
- **BREAKING** MSRV is 1.68.0
21+
- **BREAKING** MSRV is 1.68.0 (UPDATE: This is actually 1.69.)
2122
- **BREAKING** renamed the `std` feature to `alloc`
2223
- **BREAKING** bumped `multiboot2` dependency to `v0.16.0`
2324
- **BREAKING** renamed `MULTIBOOT2_HEADER_MAGIC` to `MAGIC`

multiboot2-header/src/header.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use crate::{
44
HeaderTag, HeaderTagISA, HeaderTagType, InformationRequestHeaderTag, ModuleAlignHeaderTag,
55
RelocatableHeaderTag,
66
};
7-
use core::convert::TryInto;
87
use core::fmt::{Debug, Formatter};
98
use core::mem::size_of;
109

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.68"
34+
rust-version = "1.69"
3535

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

multiboot2/Changelog.md

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

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

78
## 0.19.0 (2023-09-21)
89

multiboot2/src/builder/information.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ type SerializedTag = Vec<u8>;
4747
/// Error that indicates a tag was added multiple times that is not allowed to
4848
/// be there multiple times.
4949
#[derive(Debug)]
50+
#[allow(unused)]
5051
pub struct RedundantTagError(TagType);
5152

5253
impl Display for RedundantTagError {

multiboot2/src/efi.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
99
use crate::TagTypeId;
1010
use crate::{Tag, TagTrait, TagType};
11-
use core::convert::TryInto;
1211
use core::mem::size_of;
1312

1413
/// EFI system table in 32 bit mode tag.

multiboot2/src/image_load_addr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use crate::{Tag, TagTrait, TagType, TagTypeId};
44
#[cfg(feature = "builder")]
5-
use {core::convert::TryInto, core::mem::size_of};
5+
use core::mem::size_of;
66

77
/// The physical load address tag. Typically, this is only available if the
88
/// binary was relocated, for example if the relocatable header tag was

multiboot2/src/memory_map.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ pub use uefi_raw::table::boot::MemoryDescriptor as EFIMemoryDesc;
55
pub use uefi_raw::table::boot::MemoryType as EFIMemoryAreaType;
66

77
use crate::{Tag, TagTrait, TagType, TagTypeId};
8-
use core::convert::TryInto;
98
use core::fmt::{Debug, Formatter};
109
use core::marker::PhantomData;
1110
use core::mem;

multiboot2/src/rsdp.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
//!
1414
1515
use crate::{Tag, TagTrait, TagType, TagTypeId};
16+
#[cfg(feature = "builder")]
17+
use core::mem::size_of;
1618
use core::slice;
1719
use core::str;
1820
use core::str::Utf8Error;
19-
#[cfg(feature = "builder")]
20-
use {core::convert::TryInto, core::mem::size_of};
2121

2222
const RSDPV1_LENGTH: usize = 20;
2323

0 commit comments

Comments
 (0)