Skip to content

locate_graphic_protocolのライフタイムをOS本の説明にあわせた #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
y-yu wants to merge 2 commits into
base: main
Choose a base branch
from
Open

locate_graphic_protocolのライフタイムをOS本の説明にあわせた #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bfcce0
Use the same lifetime parameter 'a between arguments and return value
y-yu Jun 1, 2025
ba3f4e1
Update GitHub Actions OS version
y-yu Jun 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Wasabi OS continuous integration
on: [push]
jobs:
build-and-test:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
container: hikalium/wasabi-builder:latest
steps:
- name: Dump metadata
Expand Down
4 changes: 2 additions & 2 deletions os/src/efi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,9 +402,9 @@ pub fn alloc_byte_slice<'a>(
Ok(unsafe { core::slice::from_raw_parts_mut(pages, size) })
}

pub fn locate_graphic_protocol<'a>(
pub fn locate_graphic_protocol(
efi_system_table: Pin<&EfiSystemTable>,
) -> Result<&'a EfiGraphicsOutputProtocol<'a>> {
) -> Result<&EfiGraphicsOutputProtocol<'_>> {
let mut graphic_output_protocol: *mut EfiGraphicsOutputProtocol =
null_mut::<EfiGraphicsOutputProtocol>();
let status = (efi_system_table.as_ref().boot_services.locate_protocol)(
Expand Down