aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Homescu <ahomescu@google.com>2024-03-15 23:35:17 +0000
committerAndrei Homescu <ahomescu@google.com>2024-03-18 18:34:18 +0000
commit9743882e1476a70f4278c7d2c55d70ea5f987ecf (patch)
tree654fad097bb2c82f34f635c1648c2844f1729350
parent6a1d469926582e20a308b83220ea6697e5dc897a (diff)
downloadcommon-9743882e1476a70f4278c7d2c55d70ea5f987ecf.tar.gz
rust_support: Run rustfmt
Bug: 304851081 Change-Id: I5ee241a21284cc7dfdea43508e90be6f0adae61c
-rw-r--r--lib/rust_support/err.rs70
-rw-r--r--lib/rust_support/lib.rs2
-rw-r--r--lib/rust_support/mmu.rs14
-rw-r--r--lib/rust_support/vmm.rs12
4 files changed, 49 insertions, 49 deletions
diff --git a/lib/rust_support/err.rs b/lib/rust_support/err.rs
index 4b83c052..f2c5a53d 100644
--- a/lib/rust_support/err.rs
+++ b/lib/rust_support/err.rs
@@ -23,47 +23,47 @@
// Bindgen emits this constant as a u32 so declare it as i32 here instead.
pub const NO_ERROR: i32 = 0;
-pub use crate::sys::ERR_GENERIC;
-pub use crate::sys::ERR_NOT_FOUND;
-pub use crate::sys::ERR_NOT_READY;
-pub use crate::sys::ERR_NO_MSG;
-pub use crate::sys::ERR_NO_MEMORY;
-pub use crate::sys::ERR_ALREADY_STARTED;
-pub use crate::sys::ERR_NOT_VALID;
-pub use crate::sys::ERR_INVALID_ARGS;
-pub use crate::sys::ERR_NOT_ENOUGH_BUFFER;
-pub use crate::sys::ERR_NOT_SUSPENDED;
-pub use crate::sys::ERR_OBJECT_DESTROYED;
-pub use crate::sys::ERR_NOT_BLOCKED;
-pub use crate::sys::ERR_TIMED_OUT;
+pub use crate::sys::ERR_ACCESS_DENIED;
pub use crate::sys::ERR_ALREADY_EXISTS;
-pub use crate::sys::ERR_CHANNEL_CLOSED;
-pub use crate::sys::ERR_OFFLINE;
-pub use crate::sys::ERR_NOT_ALLOWED;
-pub use crate::sys::ERR_BAD_PATH;
+pub use crate::sys::ERR_ALREADY_EXPIRED;
pub use crate::sys::ERR_ALREADY_MOUNTED;
-pub use crate::sys::ERR_IO;
-pub use crate::sys::ERR_NOT_DIR;
-pub use crate::sys::ERR_NOT_FILE;
-pub use crate::sys::ERR_RECURSE_TOO_DEEP;
-pub use crate::sys::ERR_NOT_SUPPORTED;
-pub use crate::sys::ERR_TOO_BIG;
+pub use crate::sys::ERR_ALREADY_STARTED;
+pub use crate::sys::ERR_BAD_HANDLE;
+pub use crate::sys::ERR_BAD_LEN;
+pub use crate::sys::ERR_BAD_PATH;
+pub use crate::sys::ERR_BAD_STATE;
+pub use crate::sys::ERR_BUSY;
pub use crate::sys::ERR_CANCELLED;
-pub use crate::sys::ERR_NOT_IMPLEMENTED;
+pub use crate::sys::ERR_CHANNEL_CLOSED;
pub use crate::sys::ERR_CHECKSUM_FAIL;
-pub use crate::sys::ERR_CRC_FAIL;
pub use crate::sys::ERR_CMD_UNKNOWN;
-pub use crate::sys::ERR_BAD_STATE;
-pub use crate::sys::ERR_BAD_LEN;
-pub use crate::sys::ERR_BUSY;
-pub use crate::sys::ERR_THREAD_DETACHED;
+pub use crate::sys::ERR_CRC_FAIL;
+pub use crate::sys::ERR_FAULT;
+pub use crate::sys::ERR_GENERIC;
pub use crate::sys::ERR_I2C_NACK;
-pub use crate::sys::ERR_ALREADY_EXPIRED;
-pub use crate::sys::ERR_OUT_OF_RANGE;
+pub use crate::sys::ERR_INVALID_ARGS;
+pub use crate::sys::ERR_IO;
+pub use crate::sys::ERR_NOT_ALLOWED;
+pub use crate::sys::ERR_NOT_BLOCKED;
pub use crate::sys::ERR_NOT_CONFIGURED;
+pub use crate::sys::ERR_NOT_DIR;
+pub use crate::sys::ERR_NOT_ENOUGH_BUFFER;
+pub use crate::sys::ERR_NOT_FILE;
+pub use crate::sys::ERR_NOT_FOUND;
+pub use crate::sys::ERR_NOT_IMPLEMENTED;
pub use crate::sys::ERR_NOT_MOUNTED;
-pub use crate::sys::ERR_FAULT;
+pub use crate::sys::ERR_NOT_READY;
+pub use crate::sys::ERR_NOT_SUPPORTED;
+pub use crate::sys::ERR_NOT_SUSPENDED;
+pub use crate::sys::ERR_NOT_VALID;
+pub use crate::sys::ERR_NO_MEMORY;
+pub use crate::sys::ERR_NO_MSG;
pub use crate::sys::ERR_NO_RESOURCES;
-pub use crate::sys::ERR_BAD_HANDLE;
-pub use crate::sys::ERR_ACCESS_DENIED;
-pub use crate::sys::ERR_PARTIAL_WRITE; \ No newline at end of file
+pub use crate::sys::ERR_OBJECT_DESTROYED;
+pub use crate::sys::ERR_OFFLINE;
+pub use crate::sys::ERR_OUT_OF_RANGE;
+pub use crate::sys::ERR_PARTIAL_WRITE;
+pub use crate::sys::ERR_RECURSE_TOO_DEEP;
+pub use crate::sys::ERR_THREAD_DETACHED;
+pub use crate::sys::ERR_TIMED_OUT;
+pub use crate::sys::ERR_TOO_BIG;
diff --git a/lib/rust_support/lib.rs b/lib/rust_support/lib.rs
index c77f0056..fc99d3d1 100644
--- a/lib/rust_support/lib.rs
+++ b/lib/rust_support/lib.rs
@@ -39,9 +39,9 @@ pub mod err;
pub mod mmu;
pub mod vmm;
+pub use sys::paddr_t;
pub use sys::status_t;
pub use sys::vaddr_t;
-pub use sys::paddr_t;
#[panic_handler]
fn handle_panic(info: &PanicInfo) -> ! {
diff --git a/lib/rust_support/mmu.rs b/lib/rust_support/mmu.rs
index efb03675..f914e774 100644
--- a/lib/rust_support/mmu.rs
+++ b/lib/rust_support/mmu.rs
@@ -22,15 +22,15 @@
*/
pub use crate::sys::ARCH_MMU_FLAG_CACHED;
-pub use crate::sys::ARCH_MMU_FLAG_UNCACHED;
-pub use crate::sys::ARCH_MMU_FLAG_UNCACHED_DEVICE;
pub use crate::sys::ARCH_MMU_FLAG_CACHE_MASK;
-pub use crate::sys::ARCH_MMU_FLAG_PERM_USER;
-pub use crate::sys::ARCH_MMU_FLAG_PERM_RO;
-pub use crate::sys::ARCH_MMU_FLAG_PERM_NO_EXECUTE;
+pub use crate::sys::ARCH_MMU_FLAG_INVALID;
pub use crate::sys::ARCH_MMU_FLAG_NS;
+pub use crate::sys::ARCH_MMU_FLAG_PERM_NO_EXECUTE;
+pub use crate::sys::ARCH_MMU_FLAG_PERM_RO;
+pub use crate::sys::ARCH_MMU_FLAG_PERM_USER;
pub use crate::sys::ARCH_MMU_FLAG_TAGGED;
-pub use crate::sys::ARCH_MMU_FLAG_INVALID;
+pub use crate::sys::ARCH_MMU_FLAG_UNCACHED;
+pub use crate::sys::ARCH_MMU_FLAG_UNCACHED_DEVICE;
pub use crate::sys::PAGE_SIZE;
-pub use crate::sys::PAGE_SIZE_SHIFT; \ No newline at end of file
+pub use crate::sys::PAGE_SIZE_SHIFT;
diff --git a/lib/rust_support/vmm.rs b/lib/rust_support/vmm.rs
index 08e293c0..f983a3eb 100644
--- a/lib/rust_support/vmm.rs
+++ b/lib/rust_support/vmm.rs
@@ -26,14 +26,14 @@ use core::ffi::c_uint;
use core::ffi::c_void;
use core::ptr::addr_of_mut;
-use crate::status_t;
use crate::paddr_t;
+use crate::status_t;
-pub use crate::sys::vmm_aspace_t;
-pub use crate::sys::vmm_alloc_physical_etc;
+pub use crate::sys::vaddr_to_paddr;
pub use crate::sys::vmm_alloc_contiguous;
+pub use crate::sys::vmm_alloc_physical_etc;
+pub use crate::sys::vmm_aspace_t;
pub use crate::sys::vmm_free_region;
-pub use crate::sys::vaddr_to_paddr;
#[inline]
pub fn vmm_get_kernel_aspace() -> *mut vmm_aspace_t {
@@ -63,6 +63,6 @@ pub unsafe fn vmm_alloc_physical(
paddr.cast_mut(),
1,
vmm_flags,
- arch_mmu_flags
+ arch_mmu_flags,
)
-} \ No newline at end of file
+}