Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build error on Rust 1.80.0 #3128

Merged
merged 4 commits into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src-tauri/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ async fn parse_project_route(configuration: Configuration, route: &str) -> Resul

#[tauri::command]
async fn read_dir_recursive(path: &str) -> Result<FileEntry, InvokeError> {
kcl_lib::settings::utils::walk_dir(&Path::new(path).to_path_buf())
kcl_lib::settings::utils::walk_dir(Path::new(path).to_path_buf())
.await
.map_err(InvokeError::from_anyhow)
}
Expand Down
50 changes: 46 additions & 4 deletions src/wasm-lib/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/wasm-lib/kcl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ schemars = { version = "0.8.17", features = ["impl_json_schema", "url", "uuid1"]
serde = { version = "1.0.204", features = ["derive"] }
serde_json = "1.0.120"
sha2 = "0.10.8"
tabled = { version = "0.15.0", optional = true }
thiserror = "1.0.62"
toml = "0.8.14"
ts-rs = { version = "9.0.1", features = ["uuid-impl", "url-impl", "chrono-impl", "no-serde-warnings", "serde-json-impl"] }
Expand Down Expand Up @@ -70,6 +71,8 @@ pyo3 = ["dep:pyo3"]
# Helper functions also used in benchmarks.
lsp-test-util = []

tabled = ["dep:tabled"]

[profile.release]
panic = "abort"
debug = true
Expand Down
4 changes: 2 additions & 2 deletions src/wasm-lib/kcl/src/settings/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ where
}

if e.file_type().await?.is_dir() {
children.push(walk_dir(&e.path()).await?);
children.push(walk_dir(e.path()).await?);
} else {
if !is_relevant_file(&e.path())? {
if !is_relevant_file(e.path())? {
continue;
}
children.push(FileEntry {
Expand Down
Loading