Merge branch 'doocs:main' into main

Author: Nothing-avil

.github/workflows/deploy.yml

@@ -69,7 +69,7 @@ jobs:
           mkdocs build -f mkdocs-en.yml
 
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./site

.github/workflows/prettier.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Run prettier
         run: |
           git config --global core.quotepath off
-          changed_files=$(git diff --name-only "${{ github.event.pull_request.base.sha }}" | grep -E '\.js$|\.ts$|\.php$|\.sql$|\.rs$|\.md$' || true)
+          changed_files=$(git diff --name-only "${{ github.event.pull_request.base.sha }}" | grep -E '\.js$|\.ts$|\.php$|\.sql$|\.md$' || true)
           if [ -n "$changed_files" ]; then
             echo "Running prettier on the changed files"
             echo "$changed_files" | xargs -d '\n' npx prettier --write

.husky/_/husky.sh

@@ -1,36 +0,0 @@
-#!/usr/bin/env sh
-if [ -z "$husky_skip_init" ]; then
-  debug () {
-    if [ "$HUSKY_DEBUG" = "1" ]; then
-      echo "husky (debug) - $1"
-    fi
-  }
-
-  readonly hook_name="$(basename -- "$0")"
-  debug "starting $hook_name..."
-
-  if [ "$HUSKY" = "0" ]; then
-    debug "HUSKY env variable is set to 0, skipping hook"
-    exit 0
-  fi
-
-  if [ -f ~/.huskyrc ]; then
-    debug "sourcing ~/.huskyrc"
-    . ~/.huskyrc
-  fi
-
-  readonly husky_skip_init=1
-  export husky_skip_init
-  sh -e "$0" "$@"
-  exitCode="$?"
-
-  if [ $exitCode != 0 ]; then
-    echo "husky - $hook_name hook exited with code $exitCode (error)"
-  fi
-
-  if [ $exitCode = 127 ]; then
-    echo "husky - command not found in PATH=$PATH"
-  fi
-
-  exit $exitCode
-fi

.husky/commit-msg

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npx --no -- commitlint --edit $1
+npx --no -- commitlint --edit $1

.husky/pre-commit

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npx lint-staged --allow-empty $1
+npx lint-staged --allow-empty $1

.prettierrc

@@ -11,10 +11,12 @@
     "braceStyle": "1tbs",
     "endOfLine": "lf",
     "sqlKeywordCase": "upper",
+    "sqlCanonicalSyntax": false,
     "overrides": [
         {
             "files": ["*.sql"],
             "options": { "parser": "mysql" }
         }
-    ]
+    ],
+    "plugins": ["prettier-plugin-sql-cst", "@prettier/plugin-php"]
 }

basic/sorting/HeapSort/README.md

@@ -207,19 +207,13 @@ fn sink(nums: &mut Vec<i32>, mut i: usize, n: usize) {
 fn main() -> io::Result<()> {
     let mut s = String::new();
     io::stdin().read_line(&mut s)?;
-    let s: Vec<usize> = s
-        .split(' ')
-        .map(|s| s.trim().parse().unwrap())
-        .collect();
+    let s: Vec<usize> = s.split(' ').map(|s| s.trim().parse().unwrap()).collect();
     // let n = s[0];
     let m = s[1];
 
     let mut nums = String::new();
     io::stdin().read_line(&mut nums)?;
-    let mut nums: Vec<i32> = nums
-        .split(' ')
-        .map(|s| s.trim().parse().unwrap())
-        .collect();
+    let mut nums: Vec<i32> = nums.split(' ').map(|s| s.trim().parse().unwrap()).collect();
 
     heap_sort(&mut nums);
     for num in nums.iter().take(m) {
@@ -486,19 +480,13 @@ fn sink(nums: &mut Vec<i32>, mut i: usize, n: usize) {
 fn main() -> io::Result<()> {
     let mut s = String::new();
     io::stdin().read_line(&mut s)?;
-    let s: Vec<usize> = s
-        .split(' ')
-        .map(|s| s.trim().parse().unwrap())
-        .collect();
+    let s: Vec<usize> = s.split(' ').map(|s| s.trim().parse().unwrap()).collect();
     // let n = s[0];
     let m = s[1];
 
     let mut nums = String::new();
     io::stdin().read_line(&mut nums)?;
-    let mut nums: Vec<i32> = nums
-        .split(' ')
-        .map(|s| s.trim().parse().unwrap())
-        .collect();
+    let mut nums: Vec<i32> = nums.split(' ').map(|s| s.trim().parse().unwrap()).collect();
 
     heap_sort(&mut nums);
     for num in nums.iter().take(m) {

basic/sorting/HeapSort/Solution.rs

@@ -37,19 +37,13 @@ fn sink(nums: &mut Vec<i32>, mut i: usize, n: usize) {
 fn main() -> io::Result<()> {
     let mut s = String::new();
     io::stdin().read_line(&mut s)?;
-    let s: Vec<usize> = s
-        .split(' ')
-        .map(|s| s.trim().parse().unwrap())
-        .collect();
+    let s: Vec<usize> = s.split(' ').map(|s| s.trim().parse().unwrap()).collect();
     // let n = s[0];
     let m = s[1];
 
     let mut nums = String::new();
     io::stdin().read_line(&mut nums)?;
-    let mut nums: Vec<i32> = nums
-        .split(' ')
-        .map(|s| s.trim().parse().unwrap())
-        .collect();
+    let mut nums: Vec<i32> = nums.split(' ').map(|s| s.trim().parse().unwrap()).collect();
 
     heap_sort(&mut nums);
     for num in nums.iter().take(m) {

basic/sorting/MergeSort/Main.rs

@@ -43,10 +43,7 @@ fn main() -> io::Result<()> {
 
     let mut nums = String::new();
     io::stdin().read_line(&mut nums)?;
-    let mut nums: Vec<i32> = nums
-        .split(' ')
-        .map(|s| s.trim().parse().unwrap())
-        .collect();
+    let mut nums: Vec<i32> = nums.split(' ').map(|s| s.trim().parse().unwrap()).collect();
 
     merge_sort(&mut nums, 0, n - 1);
     for num in nums.iter() {

basic/sorting/MergeSort/README.md

@@ -302,10 +302,7 @@ fn main() -> io::Result<()> {
 
     let mut nums = String::new();
     io::stdin().read_line(&mut nums)?;
-    let mut nums: Vec<i32> = nums
-        .split(' ')
-        .map(|s| s.trim().parse().unwrap())
-        .collect();
+    let mut nums: Vec<i32> = nums.split(' ').map(|s| s.trim().parse().unwrap()).collect();
 
     merge_sort(&mut nums, 0, n - 1);
     for num in nums.iter() {