Skip to content
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

Merge master into next #344

Merged
merged 1 commit into from
Feb 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
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
14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,27 @@ license = "MIT/Apache-2.0"
name = "x86_64"
readme = "README.md"
repository = "https://github.com/rust-osdev/x86_64"
version = "0.14.7"
version = "0.14.8"
edition = "2018"

[dependencies]
bit_field = "0.10.1"
bitflags = "1.3.2"
volatile = "0.4.4"

[build-dependencies]
cc = { version = "1.0.37", optional = true }

[features]
default = [ "nightly", "instructions" ]
instructions = []
external_asm = [ "cc" ]
nightly = [ "inline_asm", "const_fn", "abi_x86_interrupt", "doc_cfg" ]
inline_asm = []
nightly = [ "const_fn", "abi_x86_interrupt", "asm_const", "doc_cfg" ]
abi_x86_interrupt = []
const_fn = []
asm_const = []
doc_cfg = []

# These features are no longer used and only there for backwards compatibility.
external_asm = []
inline_asm = []

[package.metadata.release]
no-dev-version = true
pre-release-replacements = [
Expand Down
5 changes: 5 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Unreleased

# 0.14.8 – 2022-02-03

- Add `Cr2::read_raw` ([#334](https://github.com/rust-osdev/x86_64/pull/334))
- Add support for `MXCSR` register ([#336](https://github.com/rust-osdev/x86_64/pull/336))

# 0.14.7 – 2021-12-18

- fix: build error on the latest nightly ([#329](https://github.com/rust-osdev/x86_64/pull/329))
Expand Down
54 changes: 0 additions & 54 deletions build.rs

This file was deleted.

4 changes: 2 additions & 2 deletions src/addr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ pub struct PhysAddr(u64);
/// overwritten possibly meaningful bits. This likely indicates a bug, for example an invalid
/// address calculation.
#[derive(Debug)]
pub struct VirtAddrNotValid(u64);
pub struct VirtAddrNotValid(pub u64);

impl VirtAddr {
/// Creates a new canonical virtual address.
Expand Down Expand Up @@ -326,7 +326,7 @@ impl Sub<VirtAddr> for VirtAddr {
///
/// This means that bits 52 to 64 were not all null.
#[derive(Debug)]
pub struct PhysAddrNotValid(u64);
pub struct PhysAddrNotValid(pub u64);

impl PhysAddr {
/// Creates a new physical address.
Expand Down
Loading