Skip to content

Commit 6ad01c2

Browse files
committed
Fix some build bots
1 parent 6b70df7 commit 6ad01c2

File tree

10 files changed

+18
-32
lines changed

10 files changed

+18
-32
lines changed

crates/std_detect/src/detect/os/aarch64.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
//! - [Zircon implementation](https://fuchsia.googlesource.com/zircon/+/master/kernel/arch/arm64/feature.cpp)
1717
//! - [Linux documentation](https://www.kernel.org/doc/Documentation/arm64/cpu-feature-registers.txt)
1818
19-
use arch::detect::Feature;
20-
use arch::detect::cache;
19+
use crate::detect::{Feature, cache};
2120

2221
/// Try to read the features from the system registers.
2322
///

crates/std_detect/src/detect/os/freebsd/aarch64.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
//! Run-time feature detection for Aarch64 on FreeBSD.
22
3-
use arch::detect::Feature;
4-
use arch::detect::cache;
3+
use crate::detect::{Feature, cache};
54
use super::super::aarch64::detect_features;
65

76
/// Performs run-time feature detection.

crates/std_detect/src/detect/os/linux/aarch64.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
//! Run-time feature detection for Aarch64 on Linux.
22
3-
use arch::detect::Feature;
4-
use arch::detect::cache;
5-
use arch::detect::bit;
6-
use super::auxvec;
7-
use super::cpuinfo;
3+
use crate::detect::{Feature, cache, bit};
4+
use super::{auxvec, cpuinfo};
85

96
/// Performs run-time feature detection.
107
#[inline]

crates/std_detect/src/detect/os/linux/arm.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
//! Run-time feature detection for ARM on Linux.
22
3-
use arch::detect::Feature;
4-
use arch::detect::cache;
5-
use arch::detect::bit;
6-
use super::auxvec;
7-
use super::cpuinfo;
3+
use crate::detect::{Feature, cache, bit};
4+
use super::{auxvec, cpuinfo};
85

96
/// Performs run-time feature detection.
107
#[inline]

crates/std_detect/src/detect/os/linux/auxvec.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
//! Parses ELF auxiliary vectors.
22
#![cfg_attr(not(target_arch = "aarch64"), allow(dead_code))]
33

4-
use mem;
5-
use prelude::v1::*;
6-
use fs::File;
7-
use io::Read;
4+
extern crate std;
5+
use self::std::{prelude::v1::*, fs::File, io::Read};
6+
7+
use core::mem;
88

99
/// Key to access the CPU Hardware capabilities bitfield.
1010
pub(crate) const AT_HWCAP: usize = 16;

crates/std_detect/src/detect/os/linux/cpuinfo.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
//! Parses /proc/cpuinfo
22
#![cfg_attr(not(target_arch = "arm"), allow(dead_code))]
33

4-
use prelude::v1::*;
5-
use fs::File;
6-
use io::{self, Read};
4+
extern crate std;
5+
use self::std::{prelude::v1::*, fs::File, io, io::Read};
76

87
/// cpuinfo
98
pub(crate) struct CpuInfo {

crates/std_detect/src/detect/os/linux/mips.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
//! Run-time feature detection for MIPS on Linux.
22
3-
use arch::detect::Feature;
4-
use arch::detect::cache;
5-
use arch::detect::bit;
3+
use crate::detect::{Feature, cache, bit};
64
use super::auxvec;
75

86
/// Performs run-time feature detection.

crates/std_detect/src/detect/os/linux/powerpc.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
//! Run-time feature detection for PowerPC on Linux.
22
3-
use arch::detect::Feature;
4-
use arch::detect::cache;
5-
use super::auxvec;
6-
use super::cpuinfo;
3+
use crate::detect::{Feature, cache};
4+
use super::{auxvec, cpuinfo};
75

86
/// Performs run-time feature detection.
97
#[inline]

crates/std_detect/src/detect/os/other.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Other operating systems
22
3-
use arch::detect::Feature;
3+
use crate::detect::Feature;
44

55
/// Performs run-time feature detection.
66
#[inline]

crates/std_detect/src/detect/os/x86.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
//! x86 run-time feature detection is OS independent.
22
3-
use core::prelude::v1::*;
4-
use core::mem;
3+
use core::{prelude::v1::*, mem};
54
#[cfg(target_arch = "x86")]
65
use core::arch::x86::*;
76
#[cfg(target_arch = "x86_64")]
87
use core::arch::x86_64::*;
98

10-
use detect::{Feature, cache, bit};
9+
use crate::detect::{Feature, cache, bit};
1110

1211
/// Performs run-time feature detection.
1312
#[inline]

0 commit comments

Comments
 (0)