clippy is happy

arch/rv32i/src/lib.rs

@@ -8,7 +8,6 @@
 #![crate_name = "rv32i"]
 #![crate_type = "rlib"]
 #![no_std]
-use flux_rs::*;
 
 use core::fmt::Write;
 

arch/rv32i/src/support.rs

@@ -5,8 +5,6 @@
 //! Core low-level operations.
 
 use crate::csr::{mstatus::mstatus, CSR};
-use flux_rs::*;
-use flux_support::*;
 
 #[cfg(all(target_arch = "riscv32", target_os = "none"))]
 #[inline(always)]

arch/rv32i/src/syscall.rs

@@ -9,7 +9,6 @@ use core::mem::size_of;
 use core::ops::Range;
 
 use crate::csr::mcause;
-use flux_rs::*;
 use flux_support::*;
 use kernel::errorcode::ErrorCode;
 use kernel::syscall::ContextSwitchReason;

flux_support/src/flux_ptr.rs

@@ -4,7 +4,7 @@ use flux_rs::{refined_by, sig};
 use std::ops::Rem;
 
 #[flux_rs::opaque]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Ord)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
 #[refined_by(ptr: int)]
 pub struct FluxPtr {
     inner: *mut u8,
@@ -55,6 +55,12 @@ impl core::ops::AddAssign<usize> for FluxPtr {
     }
 }
 
+impl core::cmp::Ord for FluxPtr {
+    fn cmp(&self, other: &Self) -> core::cmp::Ordering {
+        self.as_usize().cmp(&other.as_usize())
+    }
+}
+
 // VTOCK-TODO: fill in these functions with obvious implementations
 impl FluxPtr {
     #[sig(fn(self: Self[@lhs], rhs: usize) -> Self{r: ((lhs + rhs <= usize::MAX) => r == lhs + rhs) && ((lhs + rhs > usize::MAX) => r == lhs + rhs - usize::MAX) })]
@@ -96,10 +102,12 @@ impl FluxPtr {
         unimplemented!()
     }
 
+    /// # Safety
     pub const unsafe fn offset(self, _count: isize) -> Self {
         unimplemented!()
     }
 
+    /// # Safety
     pub const unsafe fn add(self, _count: usize) -> Self {
         unimplemented!()
     }
@@ -111,8 +119,8 @@ impl FluxPtr {
 
 #[flux_rs::trusted]
 impl PartialOrd for FluxPtr {
-    fn partial_cmp(&self, _other: &Self) -> Option<core::cmp::Ordering> {
-        todo!()
+    fn partial_cmp(&self, other: &Self) -> Option<core::cmp::Ordering> {
+        Some(self.cmp(other))
     }
 
     // Provided methods

kernel/src/grant.rs

@@ -139,6 +139,7 @@ use crate::processbuffer::{ReadOnlyProcessBuffer, ReadWriteProcessBuffer};
 use crate::processbuffer::{ReadOnlyProcessBufferRef, ReadWriteProcessBufferRef};
 use crate::upcall::{Upcall, UpcallError, UpcallId};
 use crate::ErrorCode;
+#[allow(clippy::wildcard_imports)]
 use flux_support::*;
 
 /// Tracks how many upcalls a grant instance supports automatically.

kernel/src/hil/can.rs

@@ -39,6 +39,7 @@
 //!
 
 use crate::ErrorCode;
+#[allow(clippy::wildcard_imports)]
 use flux_support::*;
 
 pub const STANDARD_CAN_PACKET_SIZE: usize = 8;

kernel/src/kernel.rs

@@ -34,6 +34,7 @@ use crate::syscall::{Syscall, YieldCall};
 use crate::syscall_driver::CommandReturn;
 use crate::upcall::{Upcall, UpcallId};
 use crate::utilities::cells::NumericCellExt;
+#[allow(clippy::wildcard_imports)]
 use flux_support::*;
 
 /// Threshold in microseconds to consider a process's timeslice to be exhausted.

kernel/src/memop.rs

@@ -7,6 +7,7 @@
 use crate::process::Process;
 use crate::syscall::SyscallReturn;
 use crate::ErrorCode;
+#[allow(clippy::wildcard_imports)]
 use flux_support::*;
 
 /// Handle the `memop` syscall.

kernel/src/platform/mpu.rs

@@ -6,6 +6,7 @@
 
 use core::cmp;
 use core::fmt::{self, Display};
+#[allow(clippy::wildcard_imports)]
 use flux_support::*;
 
 /// User mode access permissions.

kernel/src/process.rs

@@ -19,6 +19,7 @@ use crate::processbuffer::{ReadOnlyProcessBuffer, ReadWriteProcessBuffer};
 use crate::storage_permissions;
 use crate::syscall::{self, Syscall, SyscallReturn};
 use crate::upcall::UpcallId;
+#[allow(clippy::wildcard_imports)]
 use flux_support::*;
 use tock_tbf::types::CommandPermissions;
 

kernel/src/process_binary.rs

@@ -13,6 +13,7 @@ use crate::config;
 use crate::debug;
 use crate::process_checker::AcceptedCredential;
 use crate::utilities::cells::OptionalCell;
+#[allow(clippy::wildcard_imports)]
 use flux_support::*;
 
 /// Errors resulting from trying to load a process binary structure from flash.

kernel/src/process_loading.rs

@@ -28,6 +28,7 @@ use crate::process_checker::{AppIdPolicy, ProcessCheckError, ProcessCheckerMachi
 use crate::process_policies::ProcessFaultPolicy;
 use crate::process_standard::ProcessStandard;
 use crate::utilities::cells::{MapCell, OptionalCell};
+#[allow(clippy::wildcard_imports)]
 use flux_support::*;
 
 /// Errors that can occur when trying to load and create processes.

kernel/src/process_standard.rs

@@ -13,6 +13,7 @@ use core::fmt::Write;
 use core::num::NonZeroU32;
 use core::ptr::NonNull;
 use core::{mem, slice, str};
+#[allow(clippy::wildcard_imports)]
 use flux_support::*;
 
 use crate::collections::queue::Queue;
@@ -2155,7 +2156,7 @@ impl<C: 'static + Chip> ProcessStandard<'_, C> {
 
     /// The lowest address of the grant region for the process.
     fn kernel_memory_break(&self) -> FluxPtrU8Mut {
-        self.breaks.get().app_break
+        self.breaks.get().kernel_memory_break
     }
 
     /// Return the highest address the process has access to, or the current

kernel/src/processbuffer.rs

@@ -30,6 +30,7 @@ use crate::ErrorCode;
 use core::cell::Cell;
 use core::marker::PhantomData;
 use core::ops::{Deref, Index, Range, RangeFrom, RangeTo};
+#[allow(clippy::wildcard_imports)]
 use flux_support::*;
 
 /// Convert a process buffer's internal representation to a

kernel/src/syscall.rs

@@ -71,6 +71,7 @@ use core::fmt::Write;
 use crate::errorcode::ErrorCode;
 use crate::process;
 pub use crate::syscall_driver::{CommandReturn, SyscallDriver};
+#[allow(clippy::wildcard_imports)]
 use flux_support::*;
 
 /// Helper function to split a [`u64`] into a higher and lower [`u32`].

kernel/src/utilities/leasable_buffer.rs

@@ -170,6 +170,7 @@
 use core::ops::{Bound, RangeBounds};
 use core::ops::{Index, IndexMut};
 use core::slice::SliceIndex;
+#[allow(clippy::wildcard_imports)]
 use flux_support::*;
 
 /// A mutable leasable buffer implementation.