From df3917dfbf322b026bf85d47c597e368f5d4ba68 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Wed, 25 Jan 2017 13:45:57 +0100 Subject: [PATCH] Update to latest bit_field version (cherry picked from commit 46100ba24b961995737dec13e65a8fcc6c6be395) --- Cargo.toml | 2 +- src/interrupts/idt.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ab0c1f23..9f0ee224 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ name = "blog_os" version = "0.1.0" [dependencies] -bit_field = "0.5.0" +bit_field = "0.7.0" bitflags = "0.7.0" multiboot2 = "0.1.0" once = "0.2.1" diff --git a/src/interrupts/idt.rs b/src/interrupts/idt.rs index 17a6af38..ea2c823e 100644 --- a/src/interrupts/idt.rs +++ b/src/interrupts/idt.rs @@ -81,7 +81,7 @@ pub struct EntryOptions(u16); impl EntryOptions { fn minimal() -> Self { let mut options = 0; - options.set_range(9..12, 0b111); // 'must-be-one' bits + options.set_bits(9..12, 0b111); // 'must-be-one' bits EntryOptions(options) } @@ -102,12 +102,12 @@ impl EntryOptions { } pub fn set_privilege_level(&mut self, dpl: u16) -> &mut Self { - self.0.set_range(13..15, dpl); + self.0.set_bits(13..15, dpl); self } pub fn set_stack_index(&mut self, index: u16) -> &mut Self { - self.0.set_range(0..3, index); + self.0.set_bits(0..3, index); self } }