Skip to content

Commit 3853475

Browse files
committed
refactor: reformat code to Rust 2024 edition style
Small fix. Signed-off-by: Zhouqi Jiang <luojia@hust.edu.cn>
1 parent faa9d84 commit 3853475

File tree

13 files changed

+14
-14
lines changed

13 files changed

+14
-14
lines changed

allwinner-hal/src/gpio/disabled.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use super::{
22
eint::EintPad,
33
function::Function,
44
input::Input,
5-
mode::{set_mode, HasMode},
5+
mode::{HasMode, set_mode},
66
output::Output,
77
register::RegisterBlock,
88
};

allwinner-hal/src/gpio/eint.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use super::{
22
disabled::Disabled,
33
function::Function,
44
input::Input,
5-
mode::{set_mode, HasMode},
5+
mode::{HasMode, set_mode},
66
output::Output,
77
port_cfg_index, port_index,
88
register::RegisterBlock,

allwinner-hal/src/gpio/function.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use super::{
22
disabled::Disabled,
33
eint::EintPad,
44
input::Input,
5-
mode::{borrow_with_mode, set_mode, HasMode},
5+
mode::{HasMode, borrow_with_mode, set_mode},
66
output::Output,
77
register::RegisterBlock,
88
};

allwinner-hal/src/gpio/input.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use super::{
22
disabled::Disabled,
33
eint::EintPad,
44
function::Function,
5-
mode::{borrow_with_mode, set_mode, HasMode},
5+
mode::{HasMode, borrow_with_mode, set_mode},
66
output::Output,
77
port_index,
88
register::RegisterBlock,

allwinner-hal/src/gpio/output.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use super::{
33
eint::EintPad,
44
function::Function,
55
input::Input,
6-
mode::{borrow_with_mode, set_mode, HasMode},
6+
mode::{HasMode, borrow_with_mode, set_mode},
77
port_index,
88
register::RegisterBlock,
99
};

allwinner-hal/src/smhc/structure.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use super::{
2+
ResponseMode, SdCardError, TransferMode,
23
register::{
34
AccessMode, BlockSize, BusWidth, CardType, Command, RegisterBlock, TransferDirection,
45
},
5-
ResponseMode, SdCardError, TransferMode,
66
};
77
use crate::ccu::{self, Clocks, SmhcClockSource};
88
use core::arch::asm;

allwinner-hal/src/uart.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use core::cell::UnsafeCell;
44

55
use crate::ccu::{self, ClockGate, Clocks};
66
use embedded_time::rate::Baud;
7-
use uart16550::{CharLen, Register, Uart16550, PARITY};
7+
use uart16550::{CharLen, PARITY, Register, Uart16550};
88

99
/// Universal Asynchronous Receiver-Transmitter registers.
1010
#[repr(C)]

allwinner-rt/examples/fn-main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#![no_std]
77
#![no_main]
88
use allwinner_hal::uart::{Config, Serial};
9-
use allwinner_rt::{entry, Clocks, Peripherals};
9+
use allwinner_rt::{Clocks, Peripherals, entry};
1010
use embedded_hal::digital::{InputPin, OutputPin};
1111

1212
#[entry]

allwinner-rt/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ core::arch::global_asm! {
134134

135135
#[cfg(any(feature = "nezha", feature = "lichee"))]
136136
pub use {
137-
self::soc::d1::{Peripherals, __rom_init_params},
137+
self::soc::d1::{__rom_init_params, Peripherals},
138138
allwinner_hal::ccu::Clocks,
139139
};
140140

allwinner-rt/src/mctl.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ pub const RAM_BASE: usize = 0x40000000;
3232
*/
3333

3434
const SYS_CFG: usize = 0x0300_0000; // 0x0300_0000 - 0x0300_0FFF
35-
// const VER_REG: usize = SYS_CFG + 0x0024;
36-
// const EMAC_EPHY_CLK_REG0: usize = SYS_CFG + 0x0030;
35+
// const VER_REG: usize = SYS_CFG + 0x0024;
36+
// const EMAC_EPHY_CLK_REG0: usize = SYS_CFG + 0x0030;
3737
const SYS_LDO_CTRL_REG: usize = SYS_CFG + 0x0150;
3838
const RES_CAL_CTRL_REG: usize = SYS_CFG + 0x0160;
3939
const RES240_CTRL_REG: usize = SYS_CFG + 0x0168;

0 commit comments

Comments
 (0)