MSRV fixes

thomcc · May 6, 2024 · 9abe831 · 9abe831
1 parent 1da9bd7
commit 9abe831
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -59,14 +59,9 @@ jobs:
           - build: win32-gnu
             os: windows-2019
             rust: stable-i686-gnu
-          # TODO: re-enable this I guess. I get inscrutable errors like
-          # `error reading from the zlib stream; class=Zlib (5)` in CI
-          # that don't repro locally, and I'm tired of getting an email
-          # about this every day.
-          #
-          # - build: msrv
-          #   os: ubuntu-latest
-          #   rust: "1.43.0"
+          - build: msrv
+            os: ubuntu-latest
+            rust: "1.57.0"
           - build: beta
             os: ubuntu-latest
             rust: beta

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "arcstr"
 version = "1.1.5"
+rust-version = "1.57.0"
 authors = ["Thom Chiovoloni <chiovolonit@gmail.com>"]
 edition = "2021"
 description = "A better reference-counted string type, with zero-cost (allocation-free) support for string literals, and reference counted substrings."

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 [![codecov](https://codecov.io/gh/thomcc/arcstr/branch/main/graph/badge.svg)](https://codecov.io/gh/thomcc/arcstr)
 [![Docs](https://docs.rs/arcstr/badge.svg)](https://docs.rs/arcstr)
 [![Latest Version](https://img.shields.io/crates/v/arcstr.svg)](https://crates.io/crates/arcstr)
-![Minimum Rust Version](https://img.shields.io/badge/MSRV%201.43-blue.svg)
+![Minimum Rust Version](https://img.shields.io/badge/MSRV%201.57-blue.svg)
 
 This crate defines `ArcStr`, a reference counted string type. It's essentially trying to be a better `Arc<str>` or `Arc<String>`, at least for most use cases.
 

diff --git a/src/arc_str.rs b/src/arc_str.rs
@@ -392,7 +392,7 @@ impl ArcStr {
     /// `Self::has_static_lenflag`)
     #[inline]
     unsafe fn load_count_flag_raw(this: &Self, ord_if_needed: Ordering) -> PackedFlagUint {
-        PackedFlagUint::from_encoded(unsafe { (*this.0.as_ptr()).count_flag.load(ord_if_needed) })
+        PackedFlagUint::from_encoded((*this.0.as_ptr()).count_flag.load(ord_if_needed))
     }
 
     #[inline]
@@ -447,7 +447,7 @@ impl ArcStr {
 
     #[inline]
     unsafe fn to_static_unchecked(this: &Self) -> &'static str {
-        unsafe { &*Self::str_ptr(this) }
+        &*Self::str_ptr(this)
     }
 
     #[inline]

diff --git a/src/mac.rs b/src/mac.rs
@@ -42,7 +42,11 @@ macro_rules! literal {
                     count_flag: $crate::_private::StaticArcStrInner::<[$crate::_private::u8; __TEXT.len()]>::STATIC_COUNT_VALUE,
                     // See comment for `_private::ConstPtrDeref` for what the hell's
                     // going on here.
-                    data: __TEXT.as_ptr().cast::<[$crate::_private::u8; __TEXT.len()]>().read(),
+                    data: *$crate::_private::ConstPtrDeref::<[$crate::_private::u8; __TEXT.len()]> {
+                        p: __TEXT.as_ptr(),
+                    }
+                    .a,
+                    // data: __TEXT.as_ptr().cast::<[$crate::_private::u8; __TEXT.len()]>().read(),
                 }
             };
             #[allow(clippy::declare_interior_mutable_const)]