Merge branch 'main' into eliza/use-std-futures

.github/workflows/ci.yml

@@ -301,27 +301,6 @@ jobs:
     - name: run Miri tests
       run: just miri maitake
 
-  ### mycelium-util ###
-
-  # run loom tests
-  util_loom:
-    needs: changed_paths
-    if: needs.changed_paths.outputs.should_skip != 'true' || !fromJSON(needs.changed_paths.outputs.paths_result).util.should_skip
-    runs-on: ubuntu-latest
-    name: Loom tests (mycelium-util)
-    steps:
-    - name: install rust toolchain
-      run: rustup show
-    - uses: actions/checkout@v4
-    - name: install Just
-      uses: extractions/setup-just@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    - name: install nextest
-      uses: taiki-e/install-action@nextest
-    - name: run loom tests
-      run: just loom mycelium-util
-
   # dummy job that depends on all required checks
   all_systems_go:
     needs:
@@ -337,7 +316,6 @@ jobs:
     - maitake_no_default_features
     - maitake_loom
     - maitake_miri
-    - util_loom
     runs-on: ubuntu-latest
     steps:
     - run: exit 0

bitfield/README.md

@@ -3,6 +3,7 @@
 🍄 bitfield utilities, courtesy of [Mycelium].
 
 [![crates.io][crates-badge]][crates-url]
+[![Changelog][changelog-badge]][changelog-url]
 [![Documentation][docs-badge]][docs-url]
 [![Documentation (HEAD)][docs-main-badge]][docs-main-url]
 [![MIT licensed][mit-badge]][mit-url]
@@ -11,6 +12,9 @@
 
 [crates-badge]: https://img.shields.io/crates/v/mycelium-bitfield.svg
 [crates-url]: https://crates.io/crates/mycelium-bitfield
+[changelog-badge]:
+    https://img.shields.io/crates/v/mycelium-bitfield?label=changelog&color=blue
+[changelog-url]: https://github.com/hawkw/mycelium/blob/main/mycelium-bitfield/CHANGELOG.md
 [docs-badge]: https://docs.rs/mycelium-bitfield/badge.svg
 [docs-url]: https://docs.rs/mycelium-bitfield
 [docs-main-badge]: https://img.shields.io/netlify/3ec00bb5-251a-4f83-ac7f-3799d95db0e6?label=docs%20%28main%20branch%29

cordyceps/README.md

@@ -3,6 +3,7 @@
 🍄 the [Mycelium] intrusive data structures library.
 
 [![crates.io][crates-badge]][crates-url]
+[![Changelog][changelog-badge]][changelog-url]
 [![Documentation][docs-badge]][docs-url]
 [![Documentation (HEAD)][docs-main-badge]][docs-main-url]
 [![MIT licensed][mit-badge]][mit-url]
@@ -11,6 +12,9 @@
 
 [crates-badge]: https://img.shields.io/crates/v/cordyceps.svg
 [crates-url]: https://crates.io/crates/cordyceps
+[changelog-badge]:
+    https://img.shields.io/crates/v/cordyceps?label=changelog&color=blue
+[changelog-url]: https://github.com/hawkw/mycelium/blob/main/cordyceps/CHANGELOG.md
 [docs-badge]: https://docs.rs/cordyceps/badge.svg
 [docs-url]: https://docs.rs/cordyceps
 [docs-main-badge]: https://img.shields.io/netlify/3ec00bb5-251a-4f83-ac7f-3799d95db0e6?label=docs%20%28main%20branch%29
@@ -106,4 +110,4 @@ The following features are available (this list is incomplete; you can help by [
 [queue]: https://docs.rs/cordyceps/latest/cordyceps/mpsc_queue/struct.MpscQueue.html
 [`Linked`]: https://docs.rs/cordyceps/latest/cordyceps/trait.Linked.html
 [`liballoc`]: https://doc.rust-lang.org/alloc/
-[`libstd`]: https://doc.rust-lang.org/std/
+[`libstd`]: https://doc.rust-lang.org/std/

default.nix

@@ -28,6 +28,6 @@ pkgs.buildEnv {
     CURL_CA_BUNDLE = "${cacert}/etc/ca-bundle.crt";
     CARGO_TERM_COLOR = "always";
     RUST_BACKTRACE = "full";
-    LD_LIBRARY_PATH = "${lib.makeLibraryPath [ zlib ]}";
+    # LD_LIBRARY_PATH = "${lib.makeLibraryPath [ zlib ]}";
   };
 }

hal-x86_64/src/cpu/msr.rs

@@ -281,9 +281,7 @@ impl<V> Msr<V> {
                 options(nomem, nostack, preserves_flags)
             );
         }
-        let result = (hi as u64) << 32 | (lo as u64);
-        tracing::trace!(rdmsr = %self, value = fmt::hex(result));
-        result
+        (hi as u64) << 32 | (lo as u64)
     }
 
     /// Writes the given raw `u64` value to this MSR.