Skip to content

Commit 95663ac

Browse files
committed
Update to 2018 edition
1 parent d4abc5b commit 95663ac

File tree

4 files changed

+3
-11
lines changed

4 files changed

+3
-11
lines changed

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ license = "MIT/Apache-2.0"
88
description = "An experimental pure-Rust x86 bootloader."
99
repository = "https://github.com/rust-osdev/bootloader"
1010
publish-lockfile = true
11+
edition = "2018"
1112

1213
[dependencies]
1314
xmas-elf = "0.6.2"

src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#![no_std]
22

3-
extern crate x86_64;
4-
53
pub mod bootinfo;
64

75
/// Defines the entry point function.

src/main.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@
88
#![no_std]
99
#![no_main]
1010

11-
extern crate bootloader;
12-
extern crate usize_conversions;
13-
extern crate x86_64;
14-
extern crate xmas_elf;
15-
#[macro_use]
16-
extern crate fixedvec;
17-
extern crate font8x8;
18-
1911
use bootloader::bootinfo::BootInfo;
2012
use core::panic::PanicInfo;
2113
use core::{mem, slice};
@@ -24,6 +16,7 @@ use x86_64::structures::paging::{Mapper, RecursivePageTable};
2416
use x86_64::structures::paging::{Page, PageTableFlags, PhysFrame, Size2MiB};
2517
use x86_64::ux::u9;
2618
use x86_64::{PhysAddr, VirtAddr};
19+
use fixedvec::alloc_stack;
2720

2821
global_asm!(include_str!("stage_1.s"));
2922
global_asm!(include_str!("stage_2.s"));

src/page_table.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use bootloader::bootinfo::MemoryRegionType;
22
use fixedvec::FixedVec;
3-
use frame_allocator::FrameAllocator;
3+
use crate::frame_allocator::FrameAllocator;
44
use x86_64::structures::paging::{self, MapToError, RecursivePageTable, UnmapError};
55
use x86_64::structures::paging::{
66
Mapper, MapperFlush, Page, PageSize, PageTableFlags, PhysFrame, Size4KiB,

0 commit comments

Comments
 (0)