Merge #19

19: Fix for newest nightly r=IsaacWoods a=IsaacWoods

bors r+

Co-authored-by: Isaac Woods <isaacwoods.home@gmail.com>

src/aml/mod.rs

@@ -7,7 +7,7 @@ pub use self::value::AmlValue;
 
 use self::parser::AmlParser;
 use self::stream::AmlStream;
-use alloc::String;
+use alloc::string::String;
 use core::{mem, slice};
 use sdt::SdtHeader;
 use {Acpi, AcpiError, AcpiHandler, PhysicalMapping};

src/aml/parser.rs

@@ -1,7 +1,7 @@
 use super::stream::AmlStream;
 use super::value::{AmlValue, FieldFlags, RegionSpace};
 use super::{opcodes, AmlError};
-use alloc::{string::ToString, String};
+use alloc::string::String;
 use bit_field::BitField;
 use core::str;
 use {Acpi, AcpiHandler};

src/lib.rs

@@ -18,7 +18,7 @@ mod hpet;
 mod rsdp;
 mod sdt;
 
-use alloc::{BTreeMap, String};
+use alloc::{collections::BTreeMap, string::String};
 use aml::{AmlError, AmlValue};
 use core::mem;
 use core::ops::Deref;

src/sdt.rs

@@ -36,7 +36,7 @@ use {Acpi, AcpiError, AcpiHandler};
 ///     "SRAT" - System Resource Affinity Table
 ///     "SSDT" - Secondary System Description Table
 ///     "XSDT" - eXtended System Descriptor Table
-#[derive(Clone)]
+#[derive(Clone, Copy)]
 #[repr(C, packed)]
 pub struct SdtHeader {
     signature: [u8; 4],