Merge branch 'main' into fix-unknown-io-error

uutils · Oct 1, 2024 · 6dfd7a7 · 6dfd7a7
2 parents 54af2bd + e0e3ea6
commit 6dfd7a7
Show file tree

Hide file tree

Showing 65 changed files with 363 additions and 415 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,13 +1,2 @@
 [target.x86_64-unknown-redox]
 linker = "x86_64-unknown-redox-gcc"
-
-[target.'cfg(clippy)']
-rustflags = [
-    "-Wclippy::use_self",
-    "-Wclippy::needless_pass_by_value",
-    "-Wclippy::semicolon_if_nothing_returned",
-    "-Wclippy::single_char_pattern",
-    "-Wclippy::explicit_iter_loop",
-    "-Wclippy::if_not_else",
-]
-
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -20,7 +20,7 @@ concurrency:
 env:
   TERMUX: v0.118.0
   KEY_POSTFIX: nextest+rustc-hash+adb+sshd+upgrade+XGB+inc18
-  COMMON_EMULATOR_OPTIONS: -no-window -noaudio -no-boot-anim -camera-back none -gpu swiftshader_indirect
+  COMMON_EMULATOR_OPTIONS: -no-window -noaudio -no-boot-anim -camera-back none -gpu swiftshader_indirect -metrics-collection
   EMULATOR_DISK_SIZE: 12GB
   EMULATOR_HEAP_SIZE: 2048M
   EMULATOR_BOOT_TIMEOUT: 1200 # 20min

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,14 +4,14 @@ repos:
     -   id: rust-linting
         name: Rust linting
         description: Run cargo fmt on files included in the commit.
-        entry: cargo fmt --
+        entry: cargo +stable fmt --
         pass_filenames: true
         types: [file, rust]
         language: system
     -   id: rust-clippy
         name: Rust clippy
         description: Run cargo clippy on files included in the commit.
-        entry: cargo clippy --workspace --all-targets --all-features --
+        entry: cargo +stable clippy --workspace --all-targets --all-features --
         pass_filenames: false
         types: [file, rust]
         language: system