Remove lifetime from Encoding and Utf8Encoding traits (#47)

* Remove lifetime parameter from `Encoding` and `Utf8Encoding` traits
* Bump minimum Rust version from `1.58.1` -> `1.65.0`, which supports GATs

Author: fominok

.github/workflows/ci.yml

@@ -69,8 +69,8 @@ jobs:
           - { rust: stable, os: ubuntu-latest, flags: "--no-default-features" }
           - { rust: stable, os: ubuntu-latest, target: wasm32-unknown-unknown, flags: "--all-features" }
           - { rust: stable, os: ubuntu-latest, target: wasm32-unknown-unknown, flags: "--no-default-features" }
-          - { rust: 1.58.1, os: ubuntu-latest, flags: "--all-features" }
-          - { rust: 1.58.1, os: ubuntu-latest, flags: "--no-default-features" }
+          - { rust: 1.65.0, os: ubuntu-latest, flags: "--all-features" }
+          - { rust: 1.65.0, os: ubuntu-latest, flags: "--no-default-features" }
     steps:
       - uses: actions/checkout@v2
       - name: Install Rust ${{ matrix.rust }} ${{ matrix.target }}

Cargo.toml

@@ -3,7 +3,7 @@ name = "typed-path"
 description = "Provides typed variants of Path and PathBuf for Unix and Windows"
 version = "0.10.0"
 edition = "2021"
-rust-version = "1.58.1"
+rust-version = "1.65.0"
 authors = ["Chip Senkbeil <chip@senkbeil.org>"]
 categories = ["development-tools", "filesystem", "os"]
 keywords = ["unicode", "utf8", "paths", "filesystem"]

README.md

@@ -8,8 +8,8 @@
 [doc_lnk]: https://docs.rs/typed-path
 [ci_img]: https://github.com/chipsenkbeil/typed-path/actions/workflows/ci.yml/badge.svg
 [ci_lnk]: https://github.com/chipsenkbeil/typed-path/actions/workflows/ci.yml
-[rustc_img]: https://img.shields.io/badge/rustc_1.58.1+-lightgray.svg
-[rustc_lnk]: https://blog.rust-lang.org/2022/01/20/Rust-1.58.1.html
+[rustc_img]: https://img.shields.io/badge/rustc_1.65.0+-lightgray.svg
+[rustc_lnk]: https://blog.rust-lang.org/2022/11/03/Rust-1.65.0/
 
 Provides typed variants of [`Path`][StdPath] and [`PathBuf`][StdPathBuf] for
 Unix and Windows.

src/common/non_utf8.rs

@@ -19,15 +19,15 @@ use crate::no_std_compat::*;
 use crate::private;
 
 /// Interface to provide meaning to a byte slice such that paths can be derived
-pub trait Encoding<'a>: private::Sealed {
+pub trait Encoding: private::Sealed {
     /// Represents the type of component that will be derived by this encoding
-    type Components: Components<'a>;
+    type Components<'a>: Components<'a>;
 
     /// Static label representing encoding type
     fn label() -> &'static str;
 
     /// Produces an iterator of [`Component`]s over the given the byte slice (`path`)
-    fn components(path: &'a [u8]) -> Self::Components;
+    fn components(path: &[u8]) -> Self::Components<'_>;
 
     /// Hashes a byte slice (`path`)
     fn hash<H: Hasher>(path: &[u8], h: &mut H);

src/common/non_utf8/iter.rs

@@ -13,17 +13,17 @@ use crate::{Component, Components, Encoding, Path};
 #[derive(Clone)]
 pub struct Iter<'a, T>
 where
-    T: Encoding<'a>,
+    T: Encoding,
 {
     _encoding: PhantomData<T>,
-    inner: <T as Encoding<'a>>::Components,
+    inner: <T as Encoding>::Components<'a>,
 }
 
 impl<'a, T> Iter<'a, T>
 where
-    T: for<'enc> Encoding<'enc> + 'a,
+    T: Encoding,
 {
-    pub(crate) fn new(inner: <T as Encoding<'a>>::Components) -> Self {
+    pub(crate) fn new(inner: <T as Encoding>::Components<'a>) -> Self {
         Self {
             _encoding: PhantomData,
             inner,
@@ -51,16 +51,16 @@ where
 
 impl<'a, T> fmt::Debug for Iter<'a, T>
 where
-    T: for<'enc> Encoding<'enc> + 'a,
+    T: for<'enc> Encoding + 'a,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         struct DebugHelper<'a, T>(&'a Path<T>)
         where
-            T: for<'enc> Encoding<'enc>;
+            T: for<'enc> Encoding;
 
         impl<T> fmt::Debug for DebugHelper<'_, T>
         where
-            T: for<'enc> Encoding<'enc>,
+            T: for<'enc> Encoding,
         {
             fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
                 f.debug_list().entries(self.0.iter()).finish()
@@ -75,7 +75,7 @@ where
 
 impl<'a, T> AsRef<Path<T>> for Iter<'a, T>
 where
-    T: for<'enc> Encoding<'enc> + 'a,
+    T: for<'enc> Encoding + 'a,
 {
     #[inline]
     fn as_ref(&self) -> &Path<T> {
@@ -85,7 +85,7 @@ where
 
 impl<'a, T> AsRef<[u8]> for Iter<'a, T>
 where
-    T: for<'enc> Encoding<'enc> + 'a,
+    T: for<'enc> Encoding + 'a,
 {
     #[inline]
     fn as_ref(&self) -> &[u8] {
@@ -95,7 +95,7 @@ where
 
 impl<'a, T> Iterator for Iter<'a, T>
 where
-    T: for<'enc> Encoding<'enc> + 'a,
+    T: for<'enc> Encoding + 'a,
 {
     type Item = &'a [u8];
 
@@ -110,7 +110,7 @@ where
 
 impl<'a, T> DoubleEndedIterator for Iter<'a, T>
 where
-    T: for<'enc> Encoding<'enc> + 'a,
+    T: for<'enc> Encoding + 'a,
 {
     #[inline]
     fn next_back(&mut self) -> Option<Self::Item> {
@@ -121,7 +121,7 @@ where
     }
 }
 
-impl<'a, T> FusedIterator for Iter<'a, T> where T: for<'enc> Encoding<'enc> + 'a {}
+impl<'a, T> FusedIterator for Iter<'a, T> where T: for<'enc> Encoding + 'a {}
 
 /// An iterator over [`Path`] and its ancestors.
 ///
@@ -145,14 +145,14 @@ impl<'a, T> FusedIterator for Iter<'a, T> where T: for<'enc> Encoding<'enc> + 'a
 #[derive(Copy, Clone, Debug)]
 pub struct Ancestors<'a, T>
 where
-    T: for<'enc> Encoding<'enc>,
+    T: for<'enc> Encoding,
 {
     pub(crate) next: Option<&'a Path<T>>,
 }
 
 impl<'a, T> Iterator for Ancestors<'a, T>
 where
-    T: for<'enc> Encoding<'enc>,
+    T: for<'enc> Encoding,
 {
     type Item = &'a Path<T>;
 
@@ -164,4 +164,4 @@ where
     }
 }
 
-impl<T> FusedIterator for Ancestors<'_, T> where T: for<'enc> Encoding<'enc> {}
+impl<T> FusedIterator for Ancestors<'_, T> where T: for<'enc> Encoding {}