Skip to content

Rollup of 7 pull requests #128501

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.

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

Closed
wants to merge 22 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
32efd23
Add target page for riscv64gc-unknown-linux-gnu
Hoverbear Jul 8, 2024
462a48e
Add new maintainers
Hoverbear Jul 18, 2024
76b4a86
refactor(pal/hermit): return `!` to satisfy rust-analyzer
mkroening Jul 31, 2024
127b469
refactor(pal/hermit): use default impl of `GlobalAlloc::alloc_zeroed`
mkroening Jul 31, 2024
22d412a
Assert that all attributes are actually checked via `CheckAttrVisitor…
oli-obk Jul 31, 2024
d210561
Add test for `coroutine` attribute
oli-obk Aug 1, 2024
b21af62
refactor(pal/hermit): make `ENV` a non-mutable static
mkroening Jul 31, 2024
4da966c
fix(pal/hermit): `deny(unsafe_op_in_unsafe_fn)`
mkroening Jul 31, 2024
820ec72
fix(os/hermit): `deny(unsafe_op_in_unsafe_fn)`
mkroening Jul 31, 2024
de78cb5
on a signed deref check, mention the right pointer in the error
RalfJung Jul 29, 2024
5d5c97a
interpret: simplify pointer arithmetic logic
RalfJung Aug 1, 2024
db1652e
fix the way we detect overflow for inbounds arithmetic (and tweak the…
RalfJung Aug 1, 2024
e157954
Fix removed `box_syntax` diagnostic if source isn't available
clubby789 Aug 1, 2024
c8a3caf
fix dropck documentation for `[T;0]` special-case
Bryanskiy Aug 1, 2024
45d35ba
chore: refactor backtrace formatting
Konippi Aug 1, 2024
e447b64
Rollup merge of #127490 - ferrocene:hoverbear/add-riscv64gc-unknown-l…
matthiaskrgr Aug 1, 2024
9c6d899
Rollup merge of #128433 - hermit-os:hermit-unsafe_op_in_unsafe_fn, r=…
matthiaskrgr Aug 1, 2024
101471d
Rollup merge of #128444 - oli-obk:checked_attrs2, r=nnethercote
matthiaskrgr Aug 1, 2024
1985413
Rollup merge of #128482 - RalfJung:ptr-signed-offset, r=oli-obk
matthiaskrgr Aug 1, 2024
21c559f
Rollup merge of #128496 - clubby789:box-syntax-multipart, r=compiler-…
matthiaskrgr Aug 1, 2024
bad2f0b
Rollup merge of #128497 - Bryanskiy:fix-dropck-doc, r=lcnr
matthiaskrgr Aug 1, 2024
7444aff
Rollup merge of #128499 - Konippi:refactor-backtrace-formatting, r=tg…
matthiaskrgr Aug 1, 2024
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
Prev Previous commit
Next Next commit
refactor(pal/hermit): return ! to satisfy rust-analyzer
This silences this rust-analyzer-specific error: `expected !, found ()`

Signed-off-by: Martin Kröning <martin.kroening@eonerc.rwth-aachen.de>
  • Loading branch information
mkroening committed Jul 31, 2024
commit 76b4a86b571408ba2f99e047e9f5972ae682cb99
6 changes: 2 additions & 4 deletions library/std/src/sys/pal/hermit/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@ pub fn unsupported_err() -> crate::io::Error {
}

pub fn abort_internal() -> ! {
unsafe {
hermit_abi::abort();
}
unsafe { hermit_abi::abort() }
}

pub fn hashmap_random_keys() -> (u64, u64) {
Expand Down Expand Up @@ -104,7 +102,7 @@ pub unsafe extern "C" fn runtime_entry(
let result = main(argc as isize, argv);

crate::sys::thread_local::destructors::run();
hermit_abi::exit(result);
hermit_abi::exit(result)
}

#[inline]
Expand Down
4 changes: 1 addition & 3 deletions library/std/src/sys/pal/hermit/os.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,7 @@ pub fn home_dir() -> Option<PathBuf> {
}

pub fn exit(code: i32) -> ! {
unsafe {
hermit_abi::exit(code);
}
unsafe { hermit_abi::exit(code) }
}

pub fn getpid() -> u32 {
Expand Down