Skip to content

misc: various improvements #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
clippy: apply new fixes + MSRV fix
  • Loading branch information
phip1611 committed Apr 2, 2024
commit d0fe1eff563c735c48fe89656fa3b55c893a4f76
2 changes: 1 addition & 1 deletion multiboot2-header/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ readme = "README.md"
homepage = "https://github.com/rust-osdev/multiboot2-header"
repository = "https://github.com/rust-osdev/multiboot2"
documentation = "https://docs.rs/multiboot2-header"
rust-version = "1.68"
rust-version = "1.69"

[[example]]
name = "minimal"
Expand Down
3 changes: 2 additions & 1 deletion multiboot2-header/Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Unreleased

- added `EndHeaderTag::default()`
- MSRV is 1.69

## 0.3.2 (2023-11-30)

Expand All @@ -17,7 +18,7 @@

## 0.3.0 (2023-06-23)

- **BREAKING** MSRV is 1.68.0
- **BREAKING** MSRV is 1.68.0 (UPDATE: This is actually 1.69.)
- **BREAKING** renamed the `std` feature to `alloc`
- **BREAKING** bumped `multiboot2` dependency to `v0.16.0`
- **BREAKING** renamed `MULTIBOOT2_HEADER_MAGIC` to `MAGIC`
Expand Down
1 change: 0 additions & 1 deletion multiboot2-header/src/header.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use crate::{
HeaderTag, HeaderTagISA, HeaderTagType, InformationRequestHeaderTag, ModuleAlignHeaderTag,
RelocatableHeaderTag,
};
use core::convert::TryInto;
use core::fmt::{Debug, Formatter};
use core::mem::size_of;

Expand Down
2 changes: 1 addition & 1 deletion multiboot2/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ readme = "README.md"
homepage = "https://github.com/rust-osdev/multiboot2"
repository = "https://github.com/rust-osdev/multiboot2"
documentation = "https://docs.rs/multiboot2"
rust-version = "1.68"
rust-version = "1.69"

[features]
default = ["builder"]
Expand Down
1 change: 1 addition & 0 deletions multiboot2/Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Unreleased

- added `InformationBuilder::default()`
- MSRV is 1.69

## 0.19.0 (2023-09-21)

Expand Down
1 change: 1 addition & 0 deletions multiboot2/src/builder/information.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ type SerializedTag = Vec<u8>;
/// Error that indicates a tag was added multiple times that is not allowed to
/// be there multiple times.
#[derive(Debug)]
#[allow(unused)]
pub struct RedundantTagError(TagType);

impl Display for RedundantTagError {
Expand Down
1 change: 0 additions & 1 deletion multiboot2/src/efi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

use crate::TagTypeId;
use crate::{Tag, TagTrait, TagType};
use core::convert::TryInto;
use core::mem::size_of;

/// EFI system table in 32 bit mode tag.
Expand Down
2 changes: 1 addition & 1 deletion multiboot2/src/image_load_addr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use crate::{Tag, TagTrait, TagType, TagTypeId};
#[cfg(feature = "builder")]
use {core::convert::TryInto, core::mem::size_of};
use core::mem::size_of;

/// The physical load address tag. Typically, this is only available if the
/// binary was relocated, for example if the relocatable header tag was
Expand Down
1 change: 0 additions & 1 deletion multiboot2/src/memory_map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ pub use uefi_raw::table::boot::MemoryDescriptor as EFIMemoryDesc;
pub use uefi_raw::table::boot::MemoryType as EFIMemoryAreaType;

use crate::{Tag, TagTrait, TagType, TagTypeId};
use core::convert::TryInto;
use core::fmt::{Debug, Formatter};
use core::marker::PhantomData;
use core::mem;
Expand Down
4 changes: 2 additions & 2 deletions multiboot2/src/rsdp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
//!

use crate::{Tag, TagTrait, TagType, TagTypeId};
#[cfg(feature = "builder")]
use core::mem::size_of;
use core::slice;
use core::str;
use core::str::Utf8Error;
#[cfg(feature = "builder")]
use {core::convert::TryInto, core::mem::size_of};

const RSDPV1_LENGTH: usize = 20;

Expand Down