Skip to content

Commit 35ac783

Browse files
committed
Move the aml crate to the 2021 Edition
Easy change while we're here
1 parent 209d8e0 commit 35ac783

File tree

5 files changed

+3
-6
lines changed

5 files changed

+3
-6
lines changed

aml/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description = "Library for parsing AML"
77
categories = ["hardware-support", "no-std"]
88
readme = "../README.md"
99
license = "MIT/Apache-2.0"
10-
edition = "2018"
10+
edition = "2021"
1111

1212
[dependencies]
1313
log = "0.4"

aml/src/expression.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use alloc::{
1515
vec,
1616
vec::Vec,
1717
};
18-
use core::{cmp::Ordering, convert::TryInto, mem, ops::Deref};
18+
use core::{cmp::Ordering, mem, ops::Deref};
1919

2020
pub fn expression_opcode<'a, 'c>() -> impl Parser<'a, 'c, AmlValue>
2121
where

aml/src/parser.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::{pkg_length::PkgLength, AmlContext, AmlError, AmlValue, DebugVerbosity};
22
use alloc::vec::Vec;
3-
use core::{convert::TryInto, marker::PhantomData};
3+
use core::marker::PhantomData;
44
use log::trace;
55

66
/// This is the number of spaces added to indent a scope when printing parser debug messages.

aml/src/pci_routing.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ use crate::{
99
};
1010
use alloc::vec::Vec;
1111
use bit_field::BitField;
12-
use core::convert::TryInto;
1312

1413
pub use crate::resource::IrqDescriptor;
1514

aml/src/value.rs

-2
Original file line numberDiff line numberDiff line change
@@ -642,8 +642,6 @@ impl Args {
642642
pub const EMPTY: Self = Self([None, None, None, None, None, None, None]);
643643

644644
pub fn from_list(list: Vec<AmlValue>) -> Result<Args, AmlError> {
645-
use core::convert::TryInto;
646-
647645
if list.len() > 7 {
648646
return Err(AmlError::TooManyArgs);
649647
}

0 commit comments

Comments
 (0)