Merge branch 'main' into other

.github/workflows/ci.yml

@@ -29,12 +29,15 @@ jobs:
   fmt:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        submodules: recursive
-    - name: Format
-      run: cargo fmt --all --check
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+          components: rustfmt
+      - name: Format
+        run: cargo fmt --all --check
 
   # Run typo checker separately.
   # This will fast-cancel other CI early if this fails.

.github/workflows/deny.yml

@@ -25,9 +25,16 @@ jobs:
           ~/.cargo
           target
         key: deny
+
+    - name: Install Rust
+      uses: dtolnay/rust-toolchain@master
+      with:
+        toolchain: stable
+
     - uses: actions/checkout@v4
       with:
         submodules: recursive
+
     - name: Install dependencies
       run: cargo install cargo-deny --locked
     - name: Deny

.github/workflows/doc.yml

@@ -40,12 +40,6 @@ jobs:
         path: target/debug
         key: doc
 
-    # Packages other than `Boost` used by `Monero` are listed here.
-    # https://github.com/monero-project/monero/blob/c444a7e002036e834bfb4c68f04a121ce1af5825/.github/workflows/build.yml#L71
-
-    - name: Install dependencies (Linux)
-      run: sudo apt install -y libboost-dev
-
     - name: Documentation
       run: cargo +nightly doc --workspace --all-features
 

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = [
 	# Binaries
 	"binaries/cuprated",
@@ -288,6 +288,9 @@ zero_repeat_side_effects = "deny"
 non_zero_suggestions = "deny"
 manual_is_power_of_two = "deny"
 used_underscore_items = "deny"
+unnecessary_map_or = "deny"
+map_all_any_identity = "deny"
+unnecessary_literal_bound = "deny"
 
 # Warm
 cast_possible_truncation = "deny"

clippy.toml

@@ -1 +1,2 @@
-upper-case-acronyms-aggressive = true
+# <https://rust-lang.github.io/rust-clippy/master/index.html#upper_case_acronyms>
+upper-case-acronyms-aggressive = true

constants/build.rs

@@ -24,7 +24,7 @@ fn set_commit_env() {
         .to_lowercase();
 
     // Commit hash should always be 40 bytes long.
-    assert_eq!(commit.as_bytes().len(), 40);
+    assert_eq!(commit.len(), 40);
 
     println!("cargo:rustc-env=COMMIT={commit}");
 }

rpc/json-rpc/src/version.rs

@@ -82,13 +82,13 @@ impl Serialize for Version {
 
 impl std::fmt::Display for Version {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, r#"{}"#, Self::TWO)
+        write!(f, "{}", Self::TWO)
     }
 }
 
 impl std::fmt::Debug for Version {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, r#"{}"#, Self::TWO)
+        write!(f, "{}", Self::TWO)
     }
 }
 

storage/database/src/config/config.rs

@@ -15,10 +15,7 @@ use crate::{config::SyncMode, constants::DATABASE_DATA_FILENAME, resize::ResizeA
 /// use cuprate_database::config::*;
 /// assert_eq!(READER_THREADS_DEFAULT.get(), 126);
 /// ```
-pub const READER_THREADS_DEFAULT: NonZeroUsize = match NonZeroUsize::new(126) {
-    Some(n) => n,
-    None => unreachable!(),
-};
+pub const READER_THREADS_DEFAULT: NonZeroUsize = NonZeroUsize::new(126).unwrap();
 
 //---------------------------------------------------------------------------------------------------- ConfigBuilder
 /// Builder for [`Config`].