From faec36ced8d2262ad8c0da37345a2fe65bd118c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 11:29:00 +0000 Subject: [PATCH] build(deps): bump x86_64 from 0.14.12 to 0.15.1 Bumps [x86_64](https://github.com/rust-osdev/x86_64) from 0.14.12 to 0.15.1. - [Changelog](https://github.com/rust-osdev/x86_64/blob/master/Changelog.md) - [Commits](https://github.com/rust-osdev/x86_64/compare/v0.14.12...v0.15.1) --- updated-dependencies: - dependency-name: x86_64 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- src/arch/x86_64/paging.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5c5c78da..1ce498e5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -830,9 +830,9 @@ dependencies = [ [[package]] name = "x86_64" -version = "0.14.12" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96cb6fd45bfeab6a5055c5bffdb08768bd0c069f1d946debe585bbb380a7c062" +checksum = "4bc79523af8abf92fb1a970c3e086c5a343f6bcc1a0eb890f575cbb3b45743df" dependencies = [ "bit_field", "bitflags 2.4.2", diff --git a/Cargo.toml b/Cargo.toml index fa202f65..243bfcc3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ multiboot = "0.8" [target.'cfg(target_arch = "x86_64")'.dependencies] uart_16550 = "0.3" -x86_64 = { version = "0.14", default-features = false, features = ["instructions"] } +x86_64 = { version = "0.15", default-features = false, features = ["instructions"] } [target.'cfg(target_arch = "aarch64")'.dependencies] aarch64-cpu = "9" diff --git a/src/arch/x86_64/paging.rs b/src/arch/x86_64/paging.rs index d4053b7a..14253564 100644 --- a/src/arch/x86_64/paging.rs +++ b/src/arch/x86_64/paging.rs @@ -28,7 +28,7 @@ where log::warn!( "Mapping {count} {size} pages from {from_start:p}..{from_end:p} to {to_start:p}..{to_end:p}", count = (pages.end.start_address() - pages.start.start_address()) / S::SIZE, - size = S::SIZE_AS_DEBUG_STR, + size = S::DEBUG_STR, from_start = pages.start.start_address(), from_end = pages.end.start_address(), to_start = frames.start.start_address(),