Merge branch 'main' into next

# Conflicts: # .github/workflows/ci.yml # .github/workflows/release.yml # Cargo.lock # Cargo.toml # package.json # rust-toolchain # src/js_macro_folder.rs # src/lib.rs
lingui · Oct 30, 2024 · 5e84f3b · 5e84f3b
2 parents 931ee1d + d02b493
commit 5e84f3b
Show file tree

Hide file tree

Showing 16 changed files with 832 additions and 765 deletions.
diff --git a/.cargo/config → .cargo/config.toml b/.cargo/config → .cargo/config.toml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ on:
       - 'LICENSE'
 
 env:
-  TOOLCHAIN: nightly-2024-07-21
+  TOOLCHAIN: 1.80.0
 
 jobs:
   check:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,7 +5,7 @@ on:
     types: [released, prereleased]
 
 env:
-  TOOLCHAIN: nightly-2024-07-21
+  TOOLCHAIN: 1.80.0
 
 jobs:
   release: