Skip to content
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
12 changes: 11 additions & 1 deletion prqlc/prqlc/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,17 @@ mod cli;

#[cfg(all(not(target_family = "wasm"), feature = "cli"))]
fn main() -> color_eyre::eyre::Result<()> {
cli::main()
// Use a larger stack size (8 MiB) to avoid stack overflows on Windows,
// where the default stack is only 1 MiB.
const STACK_SIZE: usize = 8 * 1024 * 1024;

let thread = std::thread::Builder::new()
.stack_size(STACK_SIZE)
.spawn(cli::main)
.expect("failed to spawn main thread");

thread.join().expect("main thread panicked")?;
Ok(())
}

#[cfg(any(target_family = "wasm", not(feature = "cli")))]
Expand Down
5 changes: 2 additions & 3 deletions prqlc/prqlc/src/semantic/resolver/transforms.rs
Original file line number Diff line number Diff line change
Expand Up @@ -954,9 +954,8 @@ impl Lineage {

// special case: an ref that should be inlined because this node
// might not exist in the resulting AST
if inline_refs && expr.target_id.is_some() {
if let Some(target_id) = expr.target_id.filter(|_| inline_refs) {
let ident = expr.kind.as_ident().unwrap().clone().pop_front().1.unwrap();
let target_id = expr.target_id.unwrap();
let input = &self.find_input(target_id);

self.columns.push(if input.is_some() {
Expand All @@ -973,7 +972,7 @@ impl Lineage {
}
});
return;
};
}

// base case: define the expr as a new lineage column
let (target_id, target_name) = (expr.id.unwrap(), None);
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[toolchain]
# Generally run 1 behind latest
channel = "1.92.0"
channel = "1.93.1"
components = ["rustfmt", "clippy"]
# We want two targets: wasm32, and the default target for the platform, which we
# don't list here. (i.e. we use each platform to test each platform)
Expand Down
Loading