rename the inherent step methods

This avoids any confusion between the trait methods and inherent
methods.

Author: Freax13

src/addr.rs

@@ -226,7 +226,7 @@ impl VirtAddr {
     }
 
     // FIXME: Move this into the `Step` impl, once `Step` is stabilized.
-    pub(crate) fn steps_between(start: &Self, end: &Self) -> Option<usize> {
+    pub(crate) fn steps_between_impl(start: &Self, end: &Self) -> Option<usize> {
         let mut steps = end.0.checked_sub(start.0)?;
 
         // Check if we jumped the gap.
@@ -238,7 +238,7 @@ impl VirtAddr {
     }
 
     // FIXME: Move this into the `Step` impl, once `Step` is stabilized.
-    pub(crate) fn forward_checked(start: Self, count: usize) -> Option<Self> {
+    pub(crate) fn forward_checked_impl(start: Self, count: usize) -> Option<Self> {
         let offset = u64::try_from(count).ok()?;
         if offset > ADDRESS_SPACE_SIZE {
             return None;
@@ -380,11 +380,11 @@ impl Sub<VirtAddr> for VirtAddr {
 #[cfg(feature = "step_trait")]
 impl Step for VirtAddr {
     fn steps_between(start: &Self, end: &Self) -> Option<usize> {
-        Self::steps_between(start, end)
+        Self::steps_between_impl(start, end)
     }
 
     fn forward_checked(start: Self, count: usize) -> Option<Self> {
-        Self::forward_checked(start, count)
+        Self::forward_checked_impl(start, count)
     }
 
     fn backward_checked(start: Self, count: usize) -> Option<Self> {

src/instructions/tlb.rs

@@ -298,14 +298,14 @@ where
         if let Some(mut pages) = self.page_range {
             while !pages.is_empty() {
                 // Calculate out how many pages we still need to flush.
-                let count = Page::<S>::steps_between(&pages.start, &pages.end).unwrap();
+                let count = Page::<S>::steps_between_impl(&pages.start, &pages.end).unwrap();
 
                 // Make sure that we never jump the gap in the address space when flushing.
                 let second_half_start =
                     Page::<S>::containing_address(VirtAddr::new(0xffff_8000_0000_0000));
                 let count = if pages.start < second_half_start {
                     let count_to_second_half =
-                        Page::steps_between(&pages.start, &second_half_start).unwrap();
+                        Page::steps_between_impl(&pages.start, &second_half_start).unwrap();
                     cmp::min(count, count_to_second_half)
                 } else {
                     count
@@ -331,7 +331,8 @@ where
                 // Even if the count is zero, one page is still flushed and so
                 // we need to advance by at least one.
                 let inc_count = cmp::max(count, 1);
-                pages.start = Page::forward_checked(pages.start, usize::from(inc_count)).unwrap();
+                pages.start =
+                    Page::forward_checked_impl(pages.start, usize::from(inc_count)).unwrap();
             }
         } else {
             unsafe {

src/structures/paging/page.rs

@@ -150,15 +150,15 @@ impl<S: PageSize> Page<S> {
     }
 
     // FIXME: Move this into the `Step` impl, once `Step` is stabilized.
-    pub(crate) fn steps_between(start: &Self, end: &Self) -> Option<usize> {
-        VirtAddr::steps_between(&start.start_address, &end.start_address)
+    pub(crate) fn steps_between_impl(start: &Self, end: &Self) -> Option<usize> {
+        VirtAddr::steps_between_impl(&start.start_address, &end.start_address)
             .map(|steps| steps / S::SIZE as usize)
     }
 
     // FIXME: Move this into the `Step` impl, once `Step` is stabilized.
-    pub(crate) fn forward_checked(start: Self, count: usize) -> Option<Self> {
+    pub(crate) fn forward_checked_impl(start: Self, count: usize) -> Option<Self> {
         let count = count.checked_mul(S::SIZE as usize)?;
-        let start_address = VirtAddr::forward_checked(start.start_address, count)?;
+        let start_address = VirtAddr::forward_checked_impl(start.start_address, count)?;
         Some(Self {
             start_address,
             size: PhantomData,
@@ -286,11 +286,11 @@ impl<S: PageSize> Sub<Self> for Page<S> {
 #[cfg(feature = "step_trait")]
 impl<S: PageSize> Step for Page<S> {
     fn steps_between(start: &Self, end: &Self) -> Option<usize> {
-        Self::steps_between(start, end)
+        Self::steps_between_impl(start, end)
     }
 
     fn forward_checked(start: Self, count: usize) -> Option<Self> {
-        Self::forward_checked(start, count)
+        Self::forward_checked_impl(start, count)
     }
 
     fn backward_checked(start: Self, count: usize) -> Option<Self> {