Skip to content

Commit b241fb7

Browse files
nicholasbishopnicholasbishop
committed
uefi-macros: Remove use of deprecated types from most compilation tests
Also delete the two unnamed arg tests, those will no longer be relevant after the next commit when `entry` will require a zero-arg function. Leave the entry_bad_arg test unmodified for now, as it will need additional changes in the next commit.
1 parent bbd7623 commit b241fb7

20 files changed

+27
-89
lines changed

‎uefi-macros/tests/ui/fail/entry_bad_abi.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
#![allow(unused_imports)]
21
#![no_main]
3-
#![allow(deprecated)]
42

53
use uefi::prelude::*;
6-
use uefi_macros::entry;
74

85
#[entry]
9-
extern "C" fn main(_handle: Handle, _st: SystemTable<Boot>) -> Status {
6+
extern "C" fn main() -> Status {
107
Status::SUCCESS
118
}

‎uefi-macros/tests/ui/fail/entry_bad_abi.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: Entry function must have no ABI modifier
2-
--> tests/ui/fail/entry_bad_abi.rs:9:1
2+
--> tests/ui/fail/entry_bad_abi.rs:6:1
33
|
4-
9 | extern "C" fn main(_handle: Handle, _st: SystemTable<Boot>) -> Status {
4+
6 | extern "C" fn main() -> Status {
55
| ^^^^^^

‎uefi-macros/tests/ui/fail/entry_bad_async.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
#![allow(unused_imports)]
21
#![no_main]
32

43
use uefi::prelude::*;
5-
use uefi_macros::entry;
64

75
#[entry]
8-
async fn main(_handle: Handle, _st: SystemTable<Boot>) -> Status {
6+
async fn main() -> Status {
97
Status::SUCCESS
108
}

‎uefi-macros/tests/ui/fail/entry_bad_async.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: Entry function should not be async
2-
--> tests/ui/fail/entry_bad_async.rs:8:1
2+
--> tests/ui/fail/entry_bad_async.rs:6:1
33
|
4-
8 | async fn main(_handle: Handle, _st: SystemTable<Boot>) -> Status {
4+
6 | async fn main() -> Status {
55
| ^^^^^

‎uefi-macros/tests/ui/fail/entry_bad_attr_arg.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
#![allow(unused_imports)]
21
#![no_main]
32

43
use uefi::prelude::*;
5-
use uefi_macros::entry;
64

75
#[entry(some_arg)]
8-
fn main(_handle: Handle, _st: SystemTable<Boot>) -> Status {
6+
fn main() -> Status {
97
Status::SUCCESS
108
}

‎uefi-macros/tests/ui/fail/entry_bad_attr_arg.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: Entry attribute accepts no arguments
2-
--> tests/ui/fail/entry_bad_attr_arg.rs:7:9
2+
--> tests/ui/fail/entry_bad_attr_arg.rs:5:9
33
|
4-
7 | #[entry(some_arg)]
4+
5 | #[entry(some_arg)]
55
| ^^^^^^^^

‎uefi-macros/tests/ui/fail/entry_bad_const.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
#![allow(unused_imports)]
21
#![no_main]
32

43
use uefi::prelude::*;
5-
use uefi_macros::entry;
64

75
#[entry]
8-
const fn main(_handle: Handle, _st: SystemTable<Boot>) -> Status {
6+
const fn main() -> Status {
97
Status::SUCCESS
108
}

‎uefi-macros/tests/ui/fail/entry_bad_const.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: Entry function should not be const
2-
--> tests/ui/fail/entry_bad_const.rs:8:1
2+
--> tests/ui/fail/entry_bad_const.rs:6:1
33
|
4-
8 | const fn main(_handle: Handle, _st: SystemTable<Boot>) -> Status {
4+
6 | const fn main() -> Status {
55
| ^^^^^

‎uefi-macros/tests/ui/fail/entry_bad_generic.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
#![allow(unused_imports)]
21
#![no_main]
32

43
use uefi::prelude::*;
5-
use uefi_macros::entry;
64

75
#[entry]
8-
fn main<T>(_handle: Handle, _st: SystemTable<Boot>) -> Status {
6+
fn main<T>() -> Status {
97
Status::SUCCESS
108
}

‎uefi-macros/tests/ui/fail/entry_bad_generic.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: Entry function should not be generic
2-
--> tests/ui/fail/entry_bad_generic.rs:8:9
2+
--> tests/ui/fail/entry_bad_generic.rs:6:9
33
|
4-
8 | fn main<T>(_handle: Handle, _st: SystemTable<Boot>) -> Status {
4+
6 | fn main<T>() -> Status {
55
| ^

‎uefi-macros/tests/ui/fail/entry_bad_return_type.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
#![allow(unused_imports)]
21
#![no_main]
3-
#![allow(deprecated)]
42

53
use uefi::prelude::*;
6-
use uefi_macros::entry;
74

85
#[entry]
9-
fn main(_handle: Handle, _st: SystemTable<Boot>) -> bool {
6+
fn main() -> bool {
107
false
118
}

‎uefi-macros/tests/ui/fail/entry_bad_return_type.stderr

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error[E0308]: mismatched types
2-
--> tests/ui/fail/entry_bad_return_type.rs:9:1
2+
--> tests/ui/fail/entry_bad_return_type.rs:6:1
33
|
4-
9 | fn main(_handle: Handle, _st: SystemTable<Boot>) -> bool {
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `Status`, found `bool`
4+
6 | fn main() -> bool {
5+
| ^^^^^^^^^^^^^^^^^ expected `Status`, found `bool`
66
|
7-
= note: expected fn pointer `extern "efiapi" fn(uefi::Handle, uefi::prelude::SystemTable<uefi::prelude::Boot>) -> Status`
8-
found fn pointer `extern "efiapi" fn(uefi::Handle, uefi::prelude::SystemTable<uefi::prelude::Boot>) -> bool`
7+
= note: expected fn pointer `extern "efiapi" fn(Handle, *const c_void) -> Status`
8+
found fn pointer `extern "efiapi" fn(Handle, *const c_void) -> bool`

‎uefi-macros/tests/ui/fail/entry_unnamed_image_arg.rs

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎uefi-macros/tests/ui/fail/entry_unnamed_image_arg.stderr

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎uefi-macros/tests/ui/fail/entry_unnamed_table_arg.rs

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎uefi-macros/tests/ui/fail/entry_unnamed_table_arg.stderr

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎uefi-macros/tests/ui/pass/entry.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
#![allow(deprecated)]
2-
3-
use uefi::table::{Boot, SystemTable};
4-
use uefi::{entry, Handle, Status};
1+
use uefi::{entry, Status};
52

63
#[entry]
7-
fn efi_main(image: Handle, st: SystemTable<Boot>) -> Status {
4+
fn efi_main() -> Status {
85
Status::SUCCESS
96
}
107

‎uefi-macros/tests/ui/pass/entry_docstring.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
#![allow(deprecated)]
2-
3-
use uefi::table::{Boot, SystemTable};
4-
use uefi::{entry, Handle, Status};
1+
use uefi::{entry, Status};
52

63
/// Docstring.
74
#[entry]
8-
fn efi_main(image: Handle, st: SystemTable<Boot>) -> Status {
5+
fn efi_main() -> Status {
96
Status::SUCCESS
107
}
118

‎uefi-macros/tests/ui/pass/entry_no_args.rs

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎uefi-macros/tests/ui/pass/entry_unsafe.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
#![allow(deprecated)]
2-
3-
use uefi::table::{Boot, SystemTable};
4-
use uefi::{entry, Handle, Status};
1+
use uefi::{entry, Status};
52

63
#[entry]
7-
unsafe fn efi_main(image: Handle, st: SystemTable<Boot>) -> Status {
4+
unsafe fn efi_main() -> Status {
85
Status::SUCCESS
96
}
107

0 commit comments

Comments
 (0)