Skip to content

Commit e27ae5a

Browse files
phip1611roypat
phip1611
authored and
roypat
committed
kvm-ioctls: cleanup "extern crate"
No longer needed since the Rust edition 2024 upgrade. Signed-off-by: Philipp Schuster <[email protected]> On-behalf-of: SAP [email protected]
1 parent e5a4565 commit e27ae5a

File tree

5 files changed

+3
-78
lines changed

5 files changed

+3
-78
lines changed

‎kvm-ioctls/src/ioctls/device.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ impl DeviceFd {
5151
/// upstreamed. Disabling VFIO device test for RISC-V at the time being.
5252
///
5353
/// ```rust
54-
/// # extern crate kvm_ioctls;
55-
/// # extern crate kvm_bindings;
5654
/// # use kvm_ioctls::Kvm;
5755
/// let kvm = Kvm::new().unwrap();
5856
/// let vm = kvm.create_vm().unwrap();
@@ -124,8 +122,6 @@ impl DeviceFd {
124122
/// Getting the number of IRQs for a GICv2 device on an aarch64 platform
125123
///
126124
/// ```rust
127-
/// # extern crate kvm_ioctls;
128-
/// # extern crate kvm_bindings;
129125
/// # use kvm_ioctls::Kvm;
130126
/// let kvm = Kvm::new().unwrap();
131127
/// let vm = kvm.create_vm().unwrap();

‎kvm-ioctls/src/ioctls/vcpu.rs‎

Lines changed: 1 addition & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ impl VcpuFd {
224224
/// # Example
225225
///
226226
/// ```rust
227-
/// # extern crate kvm_ioctls;
228227
/// # use kvm_ioctls::Kvm;
229228
/// let kvm = Kvm::new().unwrap();
230229
/// let vm = kvm.create_vm().unwrap();
@@ -254,8 +253,6 @@ impl VcpuFd {
254253
/// # Example
255254
///
256255
/// ```rust
257-
/// # extern crate kvm_ioctls;
258-
/// # extern crate kvm_bindings;
259256
/// # use kvm_ioctls::Kvm;
260257
/// # use kvm_bindings::{
261258
/// KVM_ARM_VCPU_PMU_V3_CTRL, KVM_ARM_VCPU_PMU_V3_INIT
@@ -296,8 +293,6 @@ impl VcpuFd {
296293
/// # Example
297294
///
298295
/// ```rust
299-
/// # extern crate kvm_ioctls;
300-
/// # extern crate kvm_bindings;
301296
/// # use kvm_ioctls::Kvm;
302297
/// # use kvm_bindings::{
303298
/// KVM_ARM_VCPU_PMU_V3_CTRL, KVM_ARM_VCPU_PMU_V3_INIT
@@ -335,7 +330,6 @@ impl VcpuFd {
335330
/// # Example
336331
///
337332
/// ```rust
338-
/// # extern crate kvm_ioctls;
339333
/// # use kvm_ioctls::Kvm;
340334
/// let kvm = Kvm::new().unwrap();
341335
/// let vm = kvm.create_vm().unwrap();
@@ -367,7 +361,6 @@ impl VcpuFd {
367361
/// # Example
368362
///
369363
/// ```rust
370-
/// # extern crate kvm_ioctls;
371364
/// # use kvm_ioctls::Kvm;
372365
/// let kvm = Kvm::new().unwrap();
373366
/// let vm = kvm.create_vm().unwrap();
@@ -396,7 +389,6 @@ impl VcpuFd {
396389
/// # Example
397390
///
398391
/// ```rust
399-
/// # extern crate kvm_ioctls;
400392
/// # use kvm_ioctls::Kvm;
401393
/// let kvm = Kvm::new().unwrap();
402394
/// let vm = kvm.create_vm().unwrap();
@@ -428,7 +420,6 @@ impl VcpuFd {
428420
/// # Example
429421
///
430422
/// ```rust
431-
/// # extern crate kvm_ioctls;
432423
/// # use kvm_ioctls::Kvm;
433424
/// let kvm = Kvm::new().unwrap();
434425
/// let vm = kvm.create_vm().unwrap();
@@ -456,8 +447,6 @@ impl VcpuFd {
456447
/// # Example
457448
///
458449
/// ```rust
459-
/// # extern crate kvm_ioctls;
460-
/// # extern crate kvm_bindings;
461450
/// # use kvm_ioctls::Kvm;
462451
/// # use kvm_bindings::kvm_fpu;
463452
/// let kvm = Kvm::new().unwrap();
@@ -492,8 +481,6 @@ impl VcpuFd {
492481
/// # Example
493482
///
494483
/// ```rust
495-
/// # extern crate kvm_ioctls;
496-
/// # extern crate kvm_bindings;
497484
/// # use kvm_bindings::KVM_MAX_CPUID_ENTRIES;
498485
/// # use kvm_ioctls::Kvm;
499486
/// let kvm = Kvm::new().unwrap();
@@ -537,8 +524,6 @@ impl VcpuFd {
537524
/// # Example
538525
///
539526
/// ```rust
540-
/// # extern crate kvm_ioctls;
541-
/// # extern crate kvm_bindings;
542527
/// # use kvm_bindings::KVM_MAX_CPUID_ENTRIES;
543528
/// # use kvm_ioctls::Kvm;
544529
/// let kvm = Kvm::new().unwrap();
@@ -576,8 +561,6 @@ impl VcpuFd {
576561
/// # Example
577562
///
578563
/// ```rust
579-
/// # extern crate kvm_ioctls;
580-
/// # extern crate kvm_bindings;
581564
/// # use kvm_bindings::{kvm_enable_cap, KVM_MAX_CPUID_ENTRIES, KVM_CAP_HYPERV_SYNIC, KVM_CAP_SPLIT_IRQCHIP};
582565
/// # use kvm_ioctls::{Kvm, Cap};
583566
/// let kvm = Kvm::new().unwrap();
@@ -617,7 +600,6 @@ impl VcpuFd {
617600
/// # Example
618601
///
619602
/// ```rust
620-
/// # extern crate kvm_ioctls;
621603
/// # use kvm_ioctls::Kvm;
622604
/// let kvm = Kvm::new().unwrap();
623605
/// let vm = kvm.create_vm().unwrap();
@@ -650,7 +632,6 @@ impl VcpuFd {
650632
/// # Example
651633
///
652634
/// ```rust
653-
/// # extern crate kvm_ioctls;
654635
/// # use kvm_ioctls::Kvm;
655636
/// use std::io::Write;
656637
///
@@ -695,8 +676,6 @@ impl VcpuFd {
695676
/// # Example
696677
///
697678
/// ```rust
698-
/// # extern crate kvm_ioctls;
699-
/// # extern crate kvm_bindings;
700679
/// # use kvm_ioctls::Kvm;
701680
/// # use kvm_bindings::{kvm_msr_entry, Msrs};
702681
/// let kvm = Kvm::new().unwrap();
@@ -739,8 +718,6 @@ impl VcpuFd {
739718
/// # Example
740719
///
741720
/// ```rust
742-
/// # extern crate kvm_ioctls;
743-
/// # extern crate kvm_bindings;
744721
/// # use kvm_ioctls::Kvm;
745722
/// # use kvm_bindings::{kvm_msr_entry, Msrs};
746723
/// let kvm = Kvm::new().unwrap();
@@ -779,7 +756,6 @@ impl VcpuFd {
779756
/// # Example
780757
///
781758
/// ```rust
782-
/// # extern crate kvm_ioctls;
783759
/// # use kvm_ioctls::Kvm;
784760
/// let kvm = Kvm::new().unwrap();
785761
/// let vm = kvm.create_vm().unwrap();
@@ -814,7 +790,6 @@ impl VcpuFd {
814790
/// # Example
815791
///
816792
/// ```rust
817-
/// # extern crate kvm_ioctls;
818793
/// # use kvm_ioctls::Kvm;
819794
/// let kvm = Kvm::new().unwrap();
820795
/// let vm = kvm.create_vm().unwrap();
@@ -850,7 +825,6 @@ impl VcpuFd {
850825
/// # Example
851826
///
852827
/// ```rust
853-
/// # extern crate kvm_ioctls;
854828
/// # use kvm_ioctls::Kvm;
855829
/// let kvm = Kvm::new().unwrap();
856830
/// let vm = kvm.create_vm().unwrap();
@@ -896,8 +870,6 @@ impl VcpuFd {
896870
/// # Example
897871
///
898872
/// ```rust
899-
/// # extern crate kvm_ioctls;
900-
/// # extern crate kvm_bindings;
901873
/// # extern crate vmm_sys_util;
902874
/// # use kvm_ioctls::{Kvm, Cap};
903875
/// # use kvm_bindings::{Xsave, kvm_xsave, kvm_xsave2};
@@ -960,7 +932,6 @@ impl VcpuFd {
960932
/// # Example
961933
///
962934
/// ```rust
963-
/// # extern crate kvm_ioctls;
964935
/// # use kvm_ioctls::Kvm;
965936
/// let kvm = Kvm::new().unwrap();
966937
/// let vm = kvm.create_vm().unwrap();
@@ -1004,8 +975,6 @@ impl VcpuFd {
1004975
/// # Example
1005976
///
1006977
/// ```rust
1007-
/// # extern crate kvm_ioctls;
1008-
/// # extern crate kvm_bindings;
1009978
/// # extern crate vmm_sys_util;
1010979
/// # use kvm_ioctls::{Kvm, Cap};
1011980
/// # use kvm_bindings::{Xsave, kvm_xsave, kvm_xsave2};
@@ -1040,7 +1009,6 @@ impl VcpuFd {
10401009
/// # Example
10411010
///
10421011
/// ```rust
1043-
/// # extern crate kvm_ioctls;
10441012
/// # use kvm_ioctls::Kvm;
10451013
/// let kvm = Kvm::new().unwrap();
10461014
/// let vm = kvm.create_vm().unwrap();
@@ -1070,7 +1038,6 @@ impl VcpuFd {
10701038
/// # Example
10711039
///
10721040
/// ```rust
1073-
/// # extern crate kvm_ioctls;
10741041
/// # use kvm_ioctls::Kvm;
10751042
/// let kvm = Kvm::new().unwrap();
10761043
/// let vm = kvm.create_vm().unwrap();
@@ -1101,7 +1068,6 @@ impl VcpuFd {
11011068
/// # Example
11021069
///
11031070
/// ```rust
1104-
/// # extern crate kvm_ioctls;
11051071
/// # use kvm_ioctls::Kvm;
11061072
/// let kvm = Kvm::new().unwrap();
11071073
/// let vm = kvm.create_vm().unwrap();
@@ -1131,7 +1097,6 @@ impl VcpuFd {
11311097
/// # Example
11321098
///
11331099
/// ```rust
1134-
/// # extern crate kvm_ioctls;
11351100
/// # use kvm_ioctls::Kvm;
11361101
/// let kvm = Kvm::new().unwrap();
11371102
/// let vm = kvm.create_vm().unwrap();
@@ -1163,7 +1128,6 @@ impl VcpuFd {
11631128
/// # Example
11641129
///
11651130
/// ```rust
1166-
/// # extern crate kvm_ioctls;
11671131
/// # use kvm_ioctls::{Kvm, Cap};
11681132
/// let kvm = Kvm::new().unwrap();
11691133
/// if kvm.check_extension(Cap::VcpuEvents) {
@@ -1195,7 +1159,6 @@ impl VcpuFd {
11951159
/// # Example
11961160
///
11971161
/// ```rust
1198-
/// # extern crate kvm_ioctls;
11991162
/// # use kvm_ioctls::{Kvm, Cap};
12001163
/// let kvm = Kvm::new().unwrap();
12011164
/// if kvm.check_extension(Cap::VcpuEvents) {
@@ -1230,8 +1193,6 @@ impl VcpuFd {
12301193
///
12311194
/// # Example
12321195
/// ```rust
1233-
/// # extern crate kvm_ioctls;
1234-
/// # extern crate kvm_bindings;
12351196
/// # use kvm_ioctls::Kvm;
12361197
/// use kvm_bindings::kvm_vcpu_init;
12371198
/// let kvm = Kvm::new().unwrap();
@@ -1279,8 +1240,6 @@ impl VcpuFd {
12791240
///
12801241
/// # Example
12811242
/// ```rust
1282-
/// # extern crate kvm_ioctls;
1283-
/// # extern crate kvm_bindings;
12841243
/// # use kvm_ioctls::Kvm;
12851244
/// use std::arch::is_aarch64_feature_detected;
12861245
///
@@ -1321,8 +1280,6 @@ impl VcpuFd {
13211280
/// # Example
13221281
///
13231282
/// ```rust
1324-
/// # extern crate kvm_ioctls;
1325-
/// # extern crate kvm_bindings;
13261283
/// # use kvm_ioctls::Kvm;
13271284
/// # use kvm_bindings::RegList;
13281285
/// let kvm = Kvm::new().unwrap();
@@ -1365,8 +1322,6 @@ impl VcpuFd {
13651322
/// # Example
13661323
///
13671324
/// ```rust
1368-
/// # extern crate kvm_ioctls;
1369-
/// # extern crate kvm_bindings;
13701325
/// # use kvm_ioctls::Kvm;
13711326
/// # use kvm_bindings::{
13721327
/// # KVM_GUESTDBG_ENABLE, KVM_GUESTDBG_USE_SW_BP, kvm_guest_debug_arch, kvm_guest_debug
@@ -1491,8 +1446,6 @@ impl VcpuFd {
14911446
/// [https://lwn.net/Articles/658511/](https://lwn.net/Articles/658511/).
14921447
///
14931448
/// ```rust
1494-
/// # extern crate kvm_ioctls;
1495-
/// # extern crate kvm_bindings;
14961449
/// # use std::io::Write;
14971450
/// # use std::ptr::null_mut;
14981451
/// # use std::slice;
@@ -1734,7 +1687,6 @@ impl VcpuFd {
17341687
/// # Example
17351688
///
17361689
/// ```rust
1737-
/// # extern crate kvm_ioctls;
17381690
/// # use kvm_ioctls::Kvm;
17391691
/// let kvm = Kvm::new().unwrap();
17401692
/// let vm = kvm.create_vm().unwrap();
@@ -1764,7 +1716,6 @@ impl VcpuFd {
17641716
/// # Example
17651717
///
17661718
/// ```rust
1767-
/// # extern crate kvm_ioctls;
17681719
/// # use kvm_ioctls::{Cap, Kvm};
17691720
/// let kvm = Kvm::new().unwrap();
17701721
/// let vm = kvm.create_vm().unwrap();
@@ -1799,7 +1750,6 @@ impl VcpuFd {
17991750
/// # Example
18001751
///
18011752
/// ```rust
1802-
/// # extern crate kvm_ioctls;
18031753
/// # use kvm_ioctls::Kvm;
18041754
/// let kvm = Kvm::new().unwrap();
18051755
/// let vm = kvm.create_vm().unwrap();
@@ -1832,7 +1782,6 @@ impl VcpuFd {
18321782
/// # Example
18331783
///
18341784
/// ```rust
1835-
/// # extern crate kvm_ioctls;
18361785
/// # use kvm_ioctls::{Kvm, SyncReg, Cap};
18371786
/// let kvm = Kvm::new().unwrap();
18381787
/// let vm = kvm.create_vm().unwrap();
@@ -1856,7 +1805,6 @@ impl VcpuFd {
18561805
/// # Example
18571806
///
18581807
/// ```rust
1859-
/// # extern crate kvm_ioctls;
18601808
/// # use kvm_ioctls::{Kvm, SyncReg, Cap};
18611809
/// let kvm = Kvm::new().unwrap();
18621810
/// let vm = kvm.create_vm().unwrap();
@@ -1878,7 +1826,6 @@ impl VcpuFd {
18781826
/// # Example
18791827
///
18801828
/// ```rust
1881-
/// # extern crate kvm_ioctls;
18821829
/// # use kvm_ioctls::{Kvm, SyncReg, Cap};
18831830
/// let kvm = Kvm::new().unwrap();
18841831
/// let vm = kvm.create_vm().unwrap();
@@ -1900,7 +1847,6 @@ impl VcpuFd {
19001847
/// # Example
19011848
///
19021849
/// ```rust
1903-
/// # extern crate kvm_ioctls;
19041850
/// # use kvm_ioctls::{Kvm, SyncReg, Cap};
19051851
/// let kvm = Kvm::new().unwrap();
19061852
/// let vm = kvm.create_vm().unwrap();
@@ -1918,7 +1864,6 @@ impl VcpuFd {
19181864
/// # Example
19191865
///
19201866
/// ```rust
1921-
/// # extern crate kvm_ioctls;
19221867
/// # use kvm_ioctls::{Kvm, SyncReg, Cap};
19231868
/// let kvm = Kvm::new().unwrap();
19241869
/// let vm = kvm.create_vm().unwrap();
@@ -1944,7 +1889,6 @@ impl VcpuFd {
19441889
/// # Example
19451890
///
19461891
/// ```rust
1947-
/// # extern crate kvm_ioctls;
19481892
/// # use kvm_ioctls::{Kvm, SyncReg, Cap};
19491893
/// let kvm = Kvm::new().unwrap();
19501894
/// let vm = kvm.create_vm().unwrap();
@@ -2177,7 +2121,6 @@ impl AsRawFd for VcpuFd {
21772121
#[cfg(test)]
21782122
mod tests {
21792123
#![allow(clippy::undocumented_unsafe_blocks)]
2180-
extern crate byteorder;
21812124

21822125
use super::*;
21832126
#[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
@@ -2349,7 +2292,7 @@ mod tests {
23492292
fn lapic_test() {
23502293
use std::io::Cursor;
23512294
// We might get read of byteorder if we replace mem::transmute with something safer.
2352-
use self::byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
2295+
use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
23532296
// As per https://github.com/torvalds/linux/arch/x86/kvm/lapic.c
23542297
// Try to write and read the APIC_ICR (0x300) register which is non-read only and
23552298
// one can simply write to it.

0 commit comments

Comments
 (0)