wip: minor

This commit is contained in:
Matthew LeVan 2024-02-08 11:37:47 -05:00
parent c43b3e4cb4
commit 116f9e8eef
3 changed files with 6 additions and 12 deletions

10
rust/ares/Cargo.lock generated
View File

@ -62,7 +62,7 @@ dependencies = [
"ares_guard", "ares_guard",
"ares_macros", "ares_macros",
"ares_pma", "ares_pma",
"assert_no_alloc 1.1.2", "assert_no_alloc",
"autotools", "autotools",
"bitvec", "bitvec",
"cc", "cc",
@ -87,7 +87,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"aes", "aes",
"aes-siv", "aes-siv",
"assert_no_alloc 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "assert_no_alloc",
"curve25519-dalek", "curve25519-dalek",
"ed25519-dalek", "ed25519-dalek",
"ibig 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "ibig 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -124,12 +124,6 @@ dependencies = [
name = "assert_no_alloc" name = "assert_no_alloc"
version = "1.1.2" version = "1.1.2"
[[package]]
name = "assert_no_alloc"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55ca83137a482d61d916ceb1eba52a684f98004f18e0cafea230fe5579c178a3"
[[package]] [[package]]
name = "atty" name = "atty"
version = "0.2.14" version = "0.2.14"

View File

@ -6,9 +6,9 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
assert_no_alloc = "1.1.2" assert_no_alloc = { path = "../rust-assert-no-alloc" }
# use this when debugging requires allocation (e.g. eprintln) # use this when debugging requires allocation (e.g. eprintln)
# assert_no_alloc = {version="1.1.2", features=["warn_debug"]} # assert_no_alloc = { path = "../rust-assert-no-alloc", features=["warn_debug"] }
ibig = "0.3.6" ibig = "0.3.6"
# ed25519 # ed25519

View File

@ -42,9 +42,9 @@ _focus_guard()
guard_p = (uint64_t *)((uintptr_t)guard_p & ~(GD_PAGESIZE - 1)); guard_p = (uint64_t *)((uintptr_t)guard_p & ~(GD_PAGESIZE - 1));
const bool same = old_guard_p == guard_p; const bool same = old_guard_p == guard_p;
const bool left = (high_p - low_p) > GD_PAGESIZE; const bool left = (uint64_t)(high_p - low_p) > GD_PAGESIZE;
if (same && !left) { if (same && !left) {
fprintf(stderr, "guard: spent: %p; left: %u\r\n", guard_p, left); fprintf(stderr, "guard: spent: %p; left: %u\r\n", (void *)guard_p, left);
return guard_spent; return guard_spent;
} }
else { else {