Increase MSRV to 1.74.0

dylni · Nov 4, 2023 · 6870f75 · 6870f75
1 parent a75032f
commit 6870f75
Show file tree

Hide file tree

Showing 12 changed files with 629 additions and 995 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,7 +2,6 @@ name: build
 
 env:
   OS_STR_BYTES_CHECKED_CONVERSIONS: 1
-  OS_STR_BYTES_NIGHTLY: 1
 
 on:
   pull_request:
@@ -27,7 +26,7 @@ jobs:
         cargo fmt --check
       shell: bash
       env:
-        cargo_hack_options: --feature-powerset --optional-deps --exclude-features nightly
+        cargo_hack_options: --feature-powerset --optional-deps
     timeout-minutes: 10
     strategy:
       matrix:
@@ -38,7 +37,6 @@ jobs:
     steps:
     - uses: dylni/build-actions/build-other@master
       with:
-        nightly-features: 'nightly print_bytes uniquote'
         target: ${{ matrix.target }}
         version: ${{ matrix.version }}
     timeout-minutes: 10
@@ -55,7 +53,6 @@ jobs:
     steps:
     - uses: dylni/build-actions/test@master
       with:
-        nightly-features: 'nightly print_bytes uniquote'
         version: ${{ matrix.version }}
     - run: cargo test --no-default-features --features raw_os_str
     timeout-minutes: 10

diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ name = "os_str_bytes"
 version = "6.6.1"
 authors = ["dylni"]
 edition = "2021"
-rust-version = "1.61.0"
+rust-version = "1.74.0"
 description = """
 Convert between byte sequences and platform-native strings
 """
@@ -31,8 +31,6 @@ lazy_static = "1.4"
 [features]
 default = ["memchr", "raw_os_str"]
 
-nightly = []
-
 checked_conversions = ["conversions"]
 conversions = []
 raw_os_str = []
diff --git a/README.md b/README.md
@@ -47,32 +47,32 @@ The minimum supported Rust toolchain version depends on the platform:
     <tr>
         <td>SOLID</td>
         <td><code>*-*-solid_asp3(-*)</code></td>
-        <td>1.61.0</td>
+        <td>1.74.0</td>
     </tr>
     <tr>
         <td>Unix</td>
         <td>Unix</td>
-        <td>1.61.0</td>
+        <td>1.74.0</td>
     </tr>
     <tr>
         <td>WASI</td>
         <td><code>*-wasi</code></td>
-        <td>1.61.0</td>
+        <td>1.74.0</td>
     </tr>
     <tr>
         <td>WebAssembly</td>
         <td><code>wasm32-*-unknown</code></td>
-        <td>1.61.0</td>
+        <td>1.74.0</td>
     </tr>
     <tr>
         <td>Windows</td>
         <td><code>*-*-windows-*</code></td>
-        <td>1.61.0</td>
+        <td>1.74.0</td>
     </tr>
     <tr>
         <td>Xous</td>
         <td><code>*-*-xous-*</code></td>
-        <td>1.74 (rust-lang/rust#104101)</td>
+        <td>1.74.0</td>
     </tr>
 </table>
 

diff --git a/src/common/raw.rs b/src/common/raw.rs
@@ -3,35 +3,6 @@ use std::fmt::Formatter;
 
 use crate::RawOsStr;
 
-if_not_nightly! {
-    if_conversions! {
-        use super::Result;
-    }
-}
-
-if_not_nightly! {
-    #[inline(always)]
-    pub(crate) const fn is_continuation(_: u8) -> bool {
-        false
-    }
-}
-
-if_not_nightly! {
-    if_conversions! {
-        #[inline(always)]
-        pub(crate) fn validate_bytes(_: &[u8]) -> Result<()> {
-            Ok(())
-        }
-    }
-}
-
-if_not_nightly! {
-    #[inline(always)]
-    pub(crate) fn decode_code_point(_: &[u8]) -> u32 {
-        unreachable!();
-    }
-}
-
 if_conversions! {
     pub(crate) fn ends_with(string: &[u8], suffix: &[u8]) -> bool {
         string.ends_with(suffix)
@@ -44,17 +15,8 @@ if_conversions! {
     }
 }
 
-fn as_inner(string: &RawOsStr) -> &[u8] {
-    if_nightly_return! {
-        {
-            string.as_encoded_bytes()
-        }
-        string.as_raw_bytes()
-    }
-}
-
 pub(crate) fn debug(string: &RawOsStr, f: &mut Formatter<'_>) -> fmt::Result {
-    for byte in as_inner(string) {
+    for byte in string.as_encoded_bytes() {
         write!(f, "\\x{:02X}", byte)?;
     }
     Ok(())
@@ -69,6 +31,6 @@ pub(crate) mod uniquote {
     use crate::RawOsStr;
 
     pub(crate) fn escape(string: &RawOsStr, f: &mut Formatter<'_>) -> Result {
-        super::as_inner(string).escape(f)
+        string.as_encoded_bytes().escape(f)
     }
 }