From 57e85d7fd0a6e16bac2d045fdec8eae036684acf Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Thu, 5 Sep 2024 17:44:57 -0400 Subject: [PATCH 1/2] Upgrade to rust 1.81.0 (#3797) * Upgrade to rust 1.81.0 * Fix new clippy warnings upgrading to 1.81.0 --- src/wasm-lib/kcl/src/std/mod.rs | 2 +- src/wasm-lib/kcl/src/token/tokeniser.rs | 2 +- src/wasm-lib/rust-toolchain.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wasm-lib/kcl/src/std/mod.rs b/src/wasm-lib/kcl/src/std/mod.rs index 8d87708f4..97e6f3c28 100644 --- a/src/wasm-lib/kcl/src/std/mod.rs +++ b/src/wasm-lib/kcl/src/std/mod.rs @@ -488,7 +488,7 @@ layout: manual buf.push_str(&fn_docs); // Write the file. - expectorate::assert_contents(&format!("../../../docs/kcl/{}.md", internal_fn.name()), &buf); + expectorate::assert_contents(format!("../../../docs/kcl/{}.md", internal_fn.name()), &buf); } } diff --git a/src/wasm-lib/kcl/src/token/tokeniser.rs b/src/wasm-lib/kcl/src/token/tokeniser.rs index 60f229a2e..9cd747fe3 100644 --- a/src/wasm-lib/kcl/src/token/tokeniser.rs +++ b/src/wasm-lib/kcl/src/token/tokeniser.rs @@ -79,7 +79,7 @@ fn whitespace(i: &mut Located<&str>) -> PResult { fn inner_word(i: &mut Located<&str>) -> PResult<()> { one_of(('a'..='z', 'A'..='Z', '_')).parse_next(i)?; - repeat(0.., one_of(('a'..='z', 'A'..='Z', '0'..='9', '_'))).parse_next(i)?; + repeat::<_, _, (), _, _>(0.., one_of(('a'..='z', 'A'..='Z', '0'..='9', '_'))).parse_next(i)?; Ok(()) } diff --git a/src/wasm-lib/rust-toolchain.toml b/src/wasm-lib/rust-toolchain.toml index 4ec1fbb28..251f956ff 100644 --- a/src/wasm-lib/rust-toolchain.toml +++ b/src/wasm-lib/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.80.1" +channel = "1.81.0" components = ["clippy", "rustfmt"] From 7cb9a2efd994bb93efab796a6b4c5c5da65b83dd Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Thu, 5 Sep 2024 15:42:50 -0700 Subject: [PATCH 2/2] Revert "Update package.json to remove tauri dep" (#3811) Revert "Update package.json to remove tauri dep (#3804)" This reverts commit dbc5f7b11fd2d4fffef63d7a5fad0e3df5308a7b. --- package.json | 1 + yarn.lock | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/package.json b/package.json index 1bdf21f2b..38c48431f 100644 --- a/package.json +++ b/package.json @@ -137,6 +137,7 @@ "@iarna/toml": "^2.2.5", "@lezer/generator": "^1.7.1", "@playwright/test": "^1.46.1", + "@tauri-apps/cli": "^2.0.0-rc.9", "@testing-library/jest-dom": "^5.14.1", "@testing-library/react": "^15.0.2", "@types/d3-force": "^3.0.10", diff --git a/yarn.lock b/yarn.lock index 25eee8acd..691b47ac6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2353,6 +2353,72 @@ resolved "https://registry.yarnpkg.com/@tanstack/virtual-core/-/virtual-core-3.8.4.tgz#0ff84b6a0e4b394335cf7ccf759c36b58cbd02eb" integrity sha512-iO5Ujgw3O1yIxWDe9FgUPNkGjyT657b1WNX52u+Wv1DyBFEpdCdGkuVaky0M3hHFqNWjAmHWTn4wgj9rTr7ZQg== +"@tauri-apps/cli-darwin-arm64@2.0.0-rc.9": + version "2.0.0-rc.9" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.0.0-rc.9.tgz#d6d9522b549a73ffb2c10ee273e6ac766dfa5914" + integrity sha512-RaCx1KpMX27iS1Cn7MYbVA0Gc5NsjU0Z1Qo42ibzF4OHInOkDcx3qjAaE+xD572Lb9ksBO725cIcYCdgqGu4Vw== + +"@tauri-apps/cli-darwin-x64@2.0.0-rc.9": + version "2.0.0-rc.9" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.0.0-rc.9.tgz#7ae9abfbeff998f13608d9248bdadba73b1560c0" + integrity sha512-KKUs8kbHYZrcmY/AjKjxEEm7aHGWQsn3+BGsgamKl97k2K5R5Z0KLJUy6QVhUSISEIievjDPmBDIwgA6mlrCLQ== + +"@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-rc.9": + version "2.0.0-rc.9" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.0.0-rc.9.tgz#8330576565f9ac411011d491a26e94d9116eb5ad" + integrity sha512-OgVCt72g0AnIB3zuKJLEIOCNeviiNeLoQQsVs7ESaqxZ/gMXY35yGVhrFm83eAQ0G4BervHDog15bsY3Dxbc/g== + +"@tauri-apps/cli-linux-arm64-gnu@2.0.0-rc.9": + version "2.0.0-rc.9" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.0.0-rc.9.tgz#9b4b79dd256c39fed495fd8b7ffdb798078c61ab" + integrity sha512-7kQcXXXpCYB0AWbTRaKAim3JVMKdrxVOiqnOW+7elkqDQxDqmLQho2ah1qHv7LzZ6Z83u5QejrRLeHrrdo3PEg== + +"@tauri-apps/cli-linux-arm64-musl@2.0.0-rc.9": + version "2.0.0-rc.9" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.0.0-rc.9.tgz#5afd06c1601ff823b7d82785236f63af379fd6d4" + integrity sha512-2hqANZrydqZpptUsfAHSL5DIaEfHN73UGEu+5keFCV1Irh+QPydr1CYrqhgFF982ev6Ars7nxALwpPhEODjYlg== + +"@tauri-apps/cli-linux-x64-gnu@2.0.0-rc.9": + version "2.0.0-rc.9" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.0.0-rc.9.tgz#39185adc857e3e8474008600b7f0a6e0e42abdbf" + integrity sha512-Zjna6eoVSlmZtzAXgH27sgJRnczNzMKRiGsMpY00PFxN9sbQwlsS3yMfB8GHsBeBoq+qJQsteRwhrn1mj6e3Rg== + +"@tauri-apps/cli-linux-x64-musl@2.0.0-rc.9": + version "2.0.0-rc.9" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.0.0-rc.9.tgz#a8d703010892622cf38e87950f5d2920833fac88" + integrity sha512-8ODcbvwZw29sAWns36BeBYJ3iu3Mtv4J3WkcoVbanVCP8nu7ja3401VnWBjckRiI1iDJIm59m6ojVkGYQhAe9Q== + +"@tauri-apps/cli-win32-arm64-msvc@2.0.0-rc.9": + version "2.0.0-rc.9" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-2.0.0-rc.9.tgz#8ddea7d990b701357fe3dfd8e8e1783898206d85" + integrity sha512-j6jJId8hlid/W4ezDRNK49DSjxb82W6d1qVqO7zksKdZLy8tVzFkZXwEeKhabzRQsO87KL34I+ciRlmInGis0Q== + +"@tauri-apps/cli-win32-ia32-msvc@2.0.0-rc.9": + version "2.0.0-rc.9" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.0.0-rc.9.tgz#ffa340d2dbf0e87355fa92650fbd707adc12d84e" + integrity sha512-w9utY58kfzJS+iLCjyQyQbJS8YaCM8YCWkgK2ZkySmHAdnqdGeyJEWig1qrLH1TWd+O6K3TlCNv55ujeAtOE4w== + +"@tauri-apps/cli-win32-x64-msvc@2.0.0-rc.9": + version "2.0.0-rc.9" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.0.0-rc.9.tgz#93f0cdc8c6999227aeee86741b553c16cb7ac20f" + integrity sha512-+l2RcpTthzYkw3VsmcZkb099Jfl0d21a9VIFxdk+duKeYieRpb0MsIBP6fS7WlNAeqrinC0zi/zt+Nia6mPuyw== + +"@tauri-apps/cli@^2.0.0-rc.9": + version "2.0.0-rc.9" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-2.0.0-rc.9.tgz#b641ad224dd055aae4f101c14d0696d2e06862c0" + integrity sha512-cjj5HVKHUlxL87TN7ZZpnlMgcBS+ToIyfLB6jpaNDZ9Op0/qzccWGZpPbW2P/BnfF/qwHzVJNUPGANFyvBSUeg== + optionalDependencies: + "@tauri-apps/cli-darwin-arm64" "2.0.0-rc.9" + "@tauri-apps/cli-darwin-x64" "2.0.0-rc.9" + "@tauri-apps/cli-linux-arm-gnueabihf" "2.0.0-rc.9" + "@tauri-apps/cli-linux-arm64-gnu" "2.0.0-rc.9" + "@tauri-apps/cli-linux-arm64-musl" "2.0.0-rc.9" + "@tauri-apps/cli-linux-x64-gnu" "2.0.0-rc.9" + "@tauri-apps/cli-linux-x64-musl" "2.0.0-rc.9" + "@tauri-apps/cli-win32-arm64-msvc" "2.0.0-rc.9" + "@tauri-apps/cli-win32-ia32-msvc" "2.0.0-rc.9" + "@tauri-apps/cli-win32-x64-msvc" "2.0.0-rc.9" + "@testing-library/dom@^10.0.0": version "10.4.0" resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-10.4.0.tgz#82a9d9462f11d240ecadbf406607c6ceeeff43a8"