specific toolchains, reformat code

Author: fasterthanlime

.github/workflows/test.yml

@@ -1,28 +1,26 @@
 name: Tests
 
 on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-  merge_group:
+    push:
+        branches: [main]
+    pull_request:
+        branches: [main]
+    merge_group:
 
 jobs:
-  test:
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-    runs-on: ${{ matrix.os }}
+    test:
+        strategy:
+            matrix:
+                os: [ubuntu-latest, macos-latest]
+        runs-on: ${{ matrix.os }}
 
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install tools
-        uses: taiki-e/install-action@v2
-        with:
-          tool: cargo-hack,just,cargo-nextest
-      - name: Run tests
-        shell: bash
-        run: |
-          rustup toolchain install nightly --component miri,clippy
-          just
-          just miri
+        steps:
+            - uses: actions/checkout@v4
+            - name: Install tools
+              uses: taiki-e/install-action@v2
+              with:
+                  tool: cargo-hack,just,cargo-nextest
+            - name: Run tests
+              shell: bash
+              run: |
+                  just ci

Justfile

@@ -1,39 +1,53 @@
-check:
-  just install-nightly
-  just clippy
-  just nextest
-  just doc-tests
-  just absolve
+nightly_version := "nightly-2025-02-17"
 
-install-nightly:
-  echo -e "\033[1;32m🔧 Installing nightly Rust toolchain...\033[0m"
-  rustup toolchain install nightly || true
+quickcheck:
+    just install-toolchains
+    just rustfmt
+    just clippy
+    just nextest
+    just doc-tests
+    just absolve
+
+ci:
+    just quickcheck
+    just miri
+
+install-toolchains:
+    echo -e "\033[1;32m🔧 Installing Rust toolchain specified in rust-toolchain.toml...\033[0m"
+    rustup show
+    rustup toolchain install {{nightly_version}} --profile default || true
+    rustup component add miri rust-src --toolchain {{nightly_version}} || true
 
 absolve:
-  #!/bin/bash
-  if ! cargo +nightly tree -i syn 2>/dev/null | grep -q .; then
-  echo -e "\033[38;2;255;255;255;48;2;0;0;0m free of \033[38;2;255;255;255;48;2;255;105;180m syn \033[38;2;255;255;255;48;2;0;0;0m\033[0m"
-  else
+    #!/bin/bash
+    if ! cargo tree -i syn 2>/dev/null | grep -q .; then
+    echo -e "\033[38;2;255;255;255;48;2;0;0;0m free of \033[38;2;255;255;255;48;2;255;105;180m syn \033[38;2;255;255;255;48;2;0;0;0m\033[0m"
+    else
     echo -e "\033[1;31m❌ 'syn' found in dependency tree. Here's what's using 'syn':\033[0m"
-    cargo +nightly tree -i syn -e features
+    cargo tree -i syn -e features
     exit 1
-  fi
+    fi
+
+rustfmt:
+    echo -e "\033[1;34m📝 Checking code formatting...\033[0m"
+    cargo fmt --all -- --check
+
+rustfmt-fix:
+    echo -e "\033[1;34m📝 Fixing code formatting...\033[0m"
+    cargo fmt --all
 
 clippy:
-  echo -e "\033[1;35m🔍 Running Clippy on all targets...\033[0m"
-  cargo +nightly clippy --all-targets -- -D warnings
+    echo -e "\033[1;35m🔍 Running Clippy on all targets...\033[0m"
+    cargo clippy --all-targets -- -D warnings
 
 nextest:
-  echo -e "\033[1;33m🏃 Running all but doc-tests with nextest...\033[0m"
-  cargo +nightly nextest run
+    echo -e "\033[1;33m🏃 Running all but doc-tests with nextest...\033[0m"
+    cargo nextest run
 
 doc-tests:
-  echo -e "\033[1;36m📚 Running documentation tests...\033[0m"
-  RUSTDOCFLAGS="-D warnings" cargo +nightly test --doc
+    echo -e "\033[1;36m📚 Running documentation tests...\033[0m"
+    RUSTDOCFLAGS="-D warnings" cargo test --doc
 
 miri:
-  echo -e "\033[1;31m🧪 Running tests under Miri...\033[0m"
-  cargo +nightly miri nextest run
-
-publish:
-  cargo +nightly publish --workspace -Zpackage-workspace
+    echo -e "\033[1;31m🧪 Running tests under Miri in a separate target directory...\033[0m"
+    cargo +{{nightly_version}} miri nextest run --target-dir=target/miri

rust-toolchain.toml

@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.85.0"

shapely-core/src/hashmap_impl.rs

@@ -1,6 +1,6 @@
 use std::{alloc::Layout, collections::HashMap, fmt};
 
-use crate::{mini_typeid, Innards, Shape, Shapely};
+use crate::{Innards, Shape, Shapely, mini_typeid};
 
 impl<V> Shapely for HashMap<String, V>
 where

shapely-core/src/partial.rs

@@ -1,4 +1,4 @@
-use crate::{trace, FieldError, ShapeDesc, Shapely, Slot};
+use crate::{FieldError, ShapeDesc, Shapely, Slot, trace};
 use std::{alloc, ptr::NonNull};
 
 /// Origin of the partial — did we allocate it? Or is it borrowed?
@@ -242,8 +242,7 @@ impl Partial<'_> {
 
             panic!(
                 "This is a partial \x1b[1;34m{}\x1b[0m, you can't build a \x1b[1;32m{}\x1b[0m out of it",
-                partial_shape,
-                target_shape,
+                partial_shape, target_shape,
             );
         }
     }

shapely-core/src/scalar_contents_tests.rs

@@ -9,16 +9,16 @@ macro_rules! test_scalar_type {
         fn $test_name() {
             // Create a value
             let v: $type = $value;
-            
+
             // Get a pointer to the value
             let v_addr: *const u8 = &v as *const $type as *const u8;
-            
+
             // Get the shape for the type
             let v_shape = <$type>::shape();
-            
+
             // Get the scalar contents (this is unsafe)
             let scalar_contents = unsafe { v_shape.get_scalar_contents(v_addr) };
-            
+
             // Verify the contents
             assert_eq!(scalar_contents, $expected);
         }
@@ -27,26 +27,76 @@ macro_rules! test_scalar_type {
 
 // Integer types
 test_scalar_type!(test_i8_scalar_contents, i8, -42, ScalarContents::I8(-42));
-test_scalar_type!(test_i16_scalar_contents, i16, -1000, ScalarContents::I16(-1000));
+test_scalar_type!(
+    test_i16_scalar_contents,
+    i16,
+    -1000,
+    ScalarContents::I16(-1000)
+);
 test_scalar_type!(test_i32_scalar_contents, i32, 23, ScalarContents::I32(23));
-test_scalar_type!(test_i64_scalar_contents, i64, -1_000_000, ScalarContents::I64(-1_000_000));
-test_scalar_type!(test_i128_scalar_contents, i128, 123_456_789, ScalarContents::I128(123_456_789));
+test_scalar_type!(
+    test_i64_scalar_contents,
+    i64,
+    -1_000_000,
+    ScalarContents::I64(-1_000_000)
+);
+test_scalar_type!(
+    test_i128_scalar_contents,
+    i128,
+    123_456_789,
+    ScalarContents::I128(123_456_789)
+);
 
 // Unsigned integer types
 test_scalar_type!(test_u8_scalar_contents, u8, 255, ScalarContents::U8(255));
-test_scalar_type!(test_u16_scalar_contents, u16, 65535, ScalarContents::U16(65535));
-test_scalar_type!(test_u32_scalar_contents, u32, 4_294_967_295, ScalarContents::U32(4_294_967_295));
-test_scalar_type!(test_u64_scalar_contents, u64, 18_446_744_073_709_551_615, ScalarContents::U64(18_446_744_073_709_551_615));
+test_scalar_type!(
+    test_u16_scalar_contents,
+    u16,
+    65535,
+    ScalarContents::U16(65535)
+);
+test_scalar_type!(
+    test_u32_scalar_contents,
+    u32,
+    4_294_967_295,
+    ScalarContents::U32(4_294_967_295)
+);
+test_scalar_type!(
+    test_u64_scalar_contents,
+    u64,
+    18_446_744_073_709_551_615,
+    ScalarContents::U64(18_446_744_073_709_551_615)
+);
 
 // Floating point types
-test_scalar_type!(test_f32_scalar_contents, f32, PI_F32, ScalarContents::F32(PI_F32));
-test_scalar_type!(test_f64_scalar_contents, f64, E_F64, ScalarContents::F64(E_F64));
+test_scalar_type!(
+    test_f32_scalar_contents,
+    f32,
+    PI_F32,
+    ScalarContents::F32(PI_F32)
+);
+test_scalar_type!(
+    test_f64_scalar_contents,
+    f64,
+    E_F64,
+    ScalarContents::F64(E_F64)
+);
 
 // Boolean type
-test_scalar_type!(test_bool_scalar_contents, bool, true, ScalarContents::Boolean(true));
+test_scalar_type!(
+    test_bool_scalar_contents,
+    bool,
+    true,
+    ScalarContents::Boolean(true)
+);
 
 // Nothing type (unit)
-test_scalar_type!(test_nothing_scalar_contents, (), (), ScalarContents::Nothing);
+test_scalar_type!(
+    test_nothing_scalar_contents,
+    (),
+    (),
+    ScalarContents::Nothing
+);
 
 // String and Bytes types need special handling due to Cow
 #[test]
@@ -55,7 +105,7 @@ fn test_string_scalar_contents() {
     let v_addr: *const u8 = &v as *const String as *const u8;
     let v_shape = String::shape();
     let scalar_contents = unsafe { v_shape.get_scalar_contents(v_addr) };
-    
+
     // We can't directly compare with ScalarContents::String because of Cow, so we match and compare the string content
     match scalar_contents {
         ScalarContents::String(s) => assert_eq!(s, "hello"),
@@ -69,7 +119,7 @@ fn test_bytes_scalar_contents() {
     let v_addr: *const u8 = &v as *const Bytes as *const u8;
     let v_shape = Bytes::shape();
     let scalar_contents = unsafe { v_shape.get_scalar_contents(v_addr) };
-    
+
     // We can't directly compare with ScalarContents::Bytes because of Cow, so we match and compare the bytes content
     match scalar_contents {
         ScalarContents::Bytes(b) => assert_eq!(b.as_ref(), &[72, 101, 108, 108, 111]),

shapely-core/src/slot.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 use std::ptr::NonNull;
 
-use crate::{trace, InitMark, ShapeDesc, Shapely};
+use crate::{InitMark, ShapeDesc, Shapely, trace};
 
 /// Where to write the value
 enum Destination<'s> {
@@ -79,13 +79,20 @@ impl<'s> Slot<'s> {
                     }
                 }
 
-                trace!("Filling struct field at address: \x1b[33m{:?}\x1b[0m with type: \x1b[33m{}\x1b[0m", ptr, T::shape());
+                trace!(
+                    "Filling struct field at address: \x1b[33m{:?}\x1b[0m with type: \x1b[33m{}\x1b[0m",
+                    ptr,
+                    T::shape()
+                );
                 unsafe { std::ptr::write(ptr.as_ptr() as *mut T, value) };
                 init_mark.set();
             }
             Destination::HashMap { map, key } => {
                 let map = unsafe { &mut *(map.as_ptr() as *mut HashMap<String, T>) };
-                trace!("Inserting value of type: \x1b[33m{}\x1b[0m into HashMap with key: \x1b[33m{key}\x1b[0m", T::shape());
+                trace!(
+                    "Inserting value of type: \x1b[33m{}\x1b[0m into HashMap with key: \x1b[33m{key}\x1b[0m",
+                    T::shape()
+                );
                 map.insert(key, value);
             }
         }

shapely-core/src/tests.rs

@@ -1,4 +1,4 @@
-use crate::{mini_typeid, Shape, Shapely};
+use crate::{Shape, Shapely, mini_typeid};
 
 #[derive(Debug, PartialEq, Eq)]
 struct FooBar {

shapely-json/src/from_json.rs

@@ -1,5 +1,5 @@
 use crate::parser::{JsonParseErrorKind, JsonParseErrorWithContext, JsonParser};
-use shapely::{error, trace, warn, Partial};
+use shapely::{Partial, error, trace, warn};
 
 pub fn from_json<'input>(
     partial: &mut Partial,

shapely-json/src/parser.rs

@@ -50,7 +50,7 @@ impl std::fmt::Display for JsonParseError {
             JsonParseErrorKind::ExpectedOpeningQuote => "Expected opening quote for string",
             JsonParseErrorKind::UnterminatedString => "Unterminated string",
             JsonParseErrorKind::InvalidEscapeSequence(ch) => {
-                return write!(f, "Invalid escape sequence: \\{}", ch)
+                return write!(f, "Invalid escape sequence: \\{}", ch);
             }
             JsonParseErrorKind::IncompleteUnicodeEscape => "Incomplete Unicode escape sequence",
             JsonParseErrorKind::InvalidUnicodeEscape => "Invalid Unicode escape sequence",
@@ -61,7 +61,7 @@ impl std::fmt::Display for JsonParseError {
             JsonParseErrorKind::InvalidValue => "Invalid value",
             JsonParseErrorKind::ExpectedClosingBrace => "Expected closing brace for object",
             JsonParseErrorKind::UnknownField(field) => {
-                return write!(f, "Unknown field: {}", field)
+                return write!(f, "Unknown field: {}", field);
             }
             JsonParseErrorKind::Custom(msg) => msg,
         };
@@ -142,7 +142,7 @@ impl<'a> JsonParser<'a> {
                     _ => {
                         return Err(
                             self.make_error(JsonParseErrorKind::InvalidEscapeSequence(ch as char))
-                        )
+                        );
                     }
                 }
                 escaped = false;