From 5f5d7cb0f710dc341ef6e955c9c52e23e179ce36 Mon Sep 17 00:00:00 2001 From: Pat Hickey Date: Tue, 30 Jun 2020 10:10:10 -0700 Subject: [PATCH] code review: remove `unsafe` on borrow checker constructor --- crates/wiggle/test-helpers/src/borrow.rs | 2 +- crates/wiggle/test-helpers/src/lib.rs | 2 +- crates/wiggle/wasmtime/src/borrow.rs | 2 +- crates/wiggle/wasmtime/src/lib.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/wiggle/test-helpers/src/borrow.rs b/crates/wiggle/test-helpers/src/borrow.rs index 454a084143..5ed16e271b 100644 --- a/crates/wiggle/test-helpers/src/borrow.rs +++ b/crates/wiggle/test-helpers/src/borrow.rs @@ -12,7 +12,7 @@ impl BorrowChecker { /// `GuestSlice` and `GuestStr` structs, which implement `std::ops::Deref` and /// `std::ops::DerefMut`. It also enforces that `GuestPtr::read` and `GuestPtr::write` do not /// access memory with an outstanding borrow. - pub unsafe fn new() -> Self { + pub fn new() -> Self { BorrowChecker { bc: RefCell::new(InnerBorrowChecker::new()), } diff --git a/crates/wiggle/test-helpers/src/lib.rs b/crates/wiggle/test-helpers/src/lib.rs index dbcccd4c77..7c9f8840ef 100644 --- a/crates/wiggle/test-helpers/src/lib.rs +++ b/crates/wiggle/test-helpers/src/lib.rs @@ -60,7 +60,7 @@ impl HostMemory { buffer: HostBuffer { cell: UnsafeCell::new([0; 4096]), }, - bc: unsafe { BorrowChecker::new() }, + bc: BorrowChecker::new(), } } diff --git a/crates/wiggle/wasmtime/src/borrow.rs b/crates/wiggle/wasmtime/src/borrow.rs index 454a084143..5ed16e271b 100644 --- a/crates/wiggle/wasmtime/src/borrow.rs +++ b/crates/wiggle/wasmtime/src/borrow.rs @@ -12,7 +12,7 @@ impl BorrowChecker { /// `GuestSlice` and `GuestStr` structs, which implement `std::ops::Deref` and /// `std::ops::DerefMut`. It also enforces that `GuestPtr::read` and `GuestPtr::write` do not /// access memory with an outstanding borrow. - pub unsafe fn new() -> Self { + pub fn new() -> Self { BorrowChecker { bc: RefCell::new(InnerBorrowChecker::new()), } diff --git a/crates/wiggle/wasmtime/src/lib.rs b/crates/wiggle/wasmtime/src/lib.rs index 358637aed4..e38ab3ac3a 100644 --- a/crates/wiggle/wasmtime/src/lib.rs +++ b/crates/wiggle/wasmtime/src/lib.rs @@ -25,7 +25,7 @@ impl WasmtimeGuestMemory { // This BorrowChecker construction is a holdover until it is // integrated fully with wasmtime: // https://github.com/bytecodealliance/wasmtime/issues/1917 - bc: unsafe { BorrowChecker::new() }, + bc: BorrowChecker::new(), } } }