chore: raise prqlc MSRV to Rust 1.85

.github/dependabot.yaml

@@ -13,20 +13,6 @@ updates:
  patch:
  update-types:
  - patch
- ignore:
- # `mdbook-core` 0.5.3+ requires `toml ^1.1.2` (0.5.2 needed `toml ^0.9.8`)
- # and `mdbook-preprocessor` 0.5.3 requires `mdbook-core ^0.5.3`; `toml` 1.1
- # requires `indexmap ^2.13`; every `indexmap` from 2.12 on declares
- # `rust-version` >= 1.82, above the project's declared 1.81.0 MSRV. So the
- # bump lands in the workspace lockfile and fails `test-msrv` — it recurred
- # weekly as #6035, #6062, #6132 and #6203, each closed unmerged. Staying on
- # 0.5.2 is a deliberate choice pending an MSRV decision (see #6203). Drop
- # these two entries once `rust-version` in the workspace `Cargo.toml` and
- # `metadata.msrv` in `prqlc/prqlc/Cargo.toml` are raised.
- - dependency-name: "mdbook-core"
- versions: [">= 0.5.3"]
- - dependency-name: "mdbook-preprocessor"
- versions: [">= 0.5.3"]
  # We exclude labels throughout because of https://github.com/dependabot/dependabot-core/issues/7645#issuecomment-1986212847
  labels: []
 

Cargo.toml

@@ -20,7 +20,7 @@ license = "Apache-2.0"
 repository = "https://github.com/PRQL/prql"
 # This isn't tested since `cargo-msrv` doesn't support workspaces; instead we
 # test `metadata.msrv` in `prqlc`
-rust-version = "1.81.0"
+rust-version = "1.85.0"
 version = "0.13.15"
 
 [profile.release]
@@ -44,7 +44,7 @@ allow-branch = ["*"]
 consolidate-commits = true
 
 [workspace.dependencies]
-anyhow = "1.0.102"
+anyhow = "1.0.103"
 arrow = { version = "53", features = [
  "pyarrow",
  "prettyprint",
@@ -59,7 +59,7 @@ pyo3-build-config = "0.27.1"
 schemars = "1.2.1"
 semver = { version = "1.0.28", features = ["serde"] }
 serde = { version = "1.0.228", features = ["derive"] }
-serde_json = "1.0.149"
+serde_json = "1.0.150"
 serde_yaml = { version = "0.9.34" }
 similar = "2.7.0"
 similar-asserts = "1.7.0"

prqlc/prqlc-parser/src/parser/stmt.rs

@@ -270,7 +270,6 @@ where
 
 #[cfg(test)]
 mod tests {
- use chumsky::prelude::*;
  use insta::{assert_debug_snapshot, assert_yaml_snapshot};
 
  use super::*;

prqlc/prqlc/Cargo.toml

@@ -10,7 +10,7 @@ rust-version.workspace = true
 version.workspace = true
 
 # Required for `cargo-msrv`, which doesn't yet support workspaces
-metadata.msrv = "1.81.0"
+metadata.msrv = "1.85.0"
 
 build = "build.rs"
 
@@ -63,7 +63,7 @@ csv = "1.4.0"
 enum-as-inner = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true }
-regex = "1.12.3"
+regex = "1.12.4"
 schemars = { workspace = true }
 semver = { workspace = true }
 # serde is required for the `from_text` feature of PRQL, so we can't really put
@@ -88,7 +88,7 @@ vergen-gitcl = { version = "1.0.8", features = ["build"] }
 
 # unique dependencies from the CLI, marked as optional and included in the 'cli'
 # feature
-anyhow = { version = "1.0.102", features = ["backtrace"], optional = true }
+anyhow = { version = "1.0.103", features = ["backtrace"], optional = true }
 clap = { version = "4.5.61", features = [
  "derive",
  "env",

prqlc/prqlc/src/cli/mod.rs

@@ -600,7 +600,7 @@ pub fn write_log(path: &std::path::Path) -> Result<()> {
 }
 
 fn drop_module_def(stmts: &mut Vec<pr::Stmt>, name: &str) {
- stmts.retain(|x| x.kind.as_module_def().map_or(true, |m| m.name != name));
+ stmts.retain(|x| x.kind.as_module_def().is_none_or(|m| m.name != name));
 }
 
 fn read_files(input: &mut clio::ClioPath) -> Result<SourceTree> {
@@ -673,10 +673,47 @@ fn combine_prql_and_frames(source: &str, frames: Vec<(Option<pr::Span>, pl::Line
 /// are in `prqlc/prqlc/src/cli/test.rs`.
 #[cfg(test)]
 mod tests {
- use insta::assert_snapshot;
+ use insta::{assert_debug_snapshot, assert_snapshot};
 
  use super::*;
 
+ #[test]
+ fn drop_named_module_def() {
+ let module = |name: &str| {
+ pr::Stmt::new(pr::StmtKind::ModuleDef(pr::ModuleDef {
+ name: name.to_string(),
+ stmts: Vec::new(),
+ }))
+ };
+ let mut stmts = vec![
+ module("std"),
+ module("user"),
+ pr::Stmt::new(pr::StmtKind::VarDef(pr::VarDef {
+ kind: pr::VarDefKind::Let,
+ name: "value".to_string(),
+ value: None,
+ ty: None,
+ })),
+ ];
+
+ drop_module_def(&mut stmts, "std");
+
+ let remaining = stmts
+ .iter()
+ .map(|stmt| {
+ stmt.kind
+ .as_module_def()
+ .map_or("<non-module>", |module| module.name.as_str())
+ })
+ .collect::<Vec<_>>();
+ assert_debug_snapshot!(remaining, @r#"
+ [
+ "user",
+ "<non-module>",
+ ]
+ "#);
+ }
+
  #[test]
  fn layouts() {
  let output = Command::execute(

prqlc/prqlc/src/cli/snapshots/prqlc__cli__test__shell_completion-2.snap

@@ -7,38 +7,35 @@ info:
  - shell-completion
  - fish
  env:
- CLICOLOR_FORCE: ""
  NO_COLOR: "1"
- RUST_BACKTRACE: ""
- RUST_LOG: ""
 ---
 success: true
 exit_code: 0
 ----- stdout -----
 # Print an optspec for argparse to handle cmd's options that are independent of any subcommand.
 function __fish_prqlc_global_optspecs
-string join \n color= h/help V/version
+string join \n color= h/help V/version
 end
 
 function __fish_prqlc_needs_command
-# Figure out if the current invocation already has a command.
-set -l cmd (commandline -opc)
-set -e cmd[1]
-argparse -s (__fish_prqlc_global_optspecs) -- $cmd 2>/dev/null
-or return
-if set -q argv[1]
-# Also print the command, so this can be used to figure out what it is.
-echo $argv[1]
-return 1
-end
-return 0
+# Figure out if the current invocation already has a command.
+set -l cmd (commandline -opc)
+set -e cmd[1]
+argparse -s (__fish_prqlc_global_optspecs) -- $cmd 2>/dev/null
+or return
+if set -q argv[1]
+# Also print the command, so this can be used to figure out what it is.
+echo $argv[1]
+return 1
+end
+return 0
 end
 
 function __fish_prqlc_using_subcommand
-set -l cmd (__fish_prqlc_needs_command)
-test -z "$cmd"
-and return 1
-contains -- $cmd[1] $argv
+set -l cmd (__fish_prqlc_needs_command)
+test -z "$cmd"
+and return 1
+contains -- $cmd[1] $argv
 end
 
 complete -c prqlc -n "__fish_prqlc_needs_command" -l color -d 'Controls when to use color' -r -f -a "auto\t''

.github/dependabot.yaml

@@ -13,20 +13,6 @@ updates:
  patch:
  update-types:
  - patch
- ignore:
- # `mdbook-core` 0.5.3+ requires `toml ^1.1.2` (0.5.2 needed `toml ^0.9.8`)
- # and `mdbook-preprocessor` 0.5.3 requires `mdbook-core ^0.5.3`; `toml` 1.1
- # requires `indexmap ^2.13`; every `indexmap` from 2.12 on declares
- # `rust-version` >= 1.82, above the project's declared 1.81.0 MSRV. So the
- # bump lands in the workspace lockfile and fails `test-msrv` — it recurred
- # weekly as #6035, #6062, #6132 and #6203, each closed unmerged. Staying on
- # 0.5.2 is a deliberate choice pending an MSRV decision (see #6203). Drop
- # these two entries once `rust-version` in the workspace `Cargo.toml` and
- # `metadata.msrv` in `prqlc/prqlc/Cargo.toml` are raised.
- - dependency-name: "mdbook-core"
- versions: [">= 0.5.3"]
- - dependency-name: "mdbook-preprocessor"
- versions: [">= 0.5.3"]
  # We exclude labels throughout because of https://github.com/dependabot/dependabot-core/issues/7645#issuecomment-1986212847
  labels: []
 

Cargo.toml

@@ -20,7 +20,7 @@ license = "Apache-2.0"
 repository = "https://github.com/PRQL/prql"
 # This isn't tested since `cargo-msrv` doesn't support workspaces; instead we
 # test `metadata.msrv` in `prqlc`
-rust-version = "1.81.0"
+rust-version = "1.85.0"
 version = "0.13.15"
 
 [profile.release]
@@ -44,7 +44,7 @@ allow-branch = ["*"]
 consolidate-commits = true
 
 [workspace.dependencies]
-anyhow = "1.0.102"
+anyhow = "1.0.103"
 arrow = { version = "53", features = [
  "pyarrow",
  "prettyprint",
@@ -59,7 +59,7 @@ pyo3-build-config = "0.27.1"
 schemars = "1.2.1"
 semver = { version = "1.0.28", features = ["serde"] }
 serde = { version = "1.0.228", features = ["derive"] }
-serde_json = "1.0.149"
+serde_json = "1.0.150"
 serde_yaml = { version = "0.9.34" }
 similar = "2.7.0"
 similar-asserts = "1.7.0"

prqlc/prqlc-parser/src/parser/stmt.rs

@@ -270,7 +270,6 @@ where
 
 #[cfg(test)]
 mod tests {
- use chumsky::prelude::*;
  use insta::{assert_debug_snapshot, assert_yaml_snapshot};
 
  use super::*;

prqlc/prqlc/Cargo.toml

@@ -10,7 +10,7 @@ rust-version.workspace = true
 version.workspace = true
 
 # Required for `cargo-msrv`, which doesn't yet support workspaces
-metadata.msrv = "1.81.0"
+metadata.msrv = "1.85.0"
 
 build = "build.rs"
 
@@ -63,7 +63,7 @@ csv = "1.4.0"
 enum-as-inner = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true }
-regex = "1.12.3"
+regex = "1.12.4"
 schemars = { workspace = true }
 semver = { workspace = true }
 # serde is required for the `from_text` feature of PRQL, so we can't really put
@@ -88,7 +88,7 @@ vergen-gitcl = { version = "1.0.8", features = ["build"] }
 
 # unique dependencies from the CLI, marked as optional and included in the 'cli'
 # feature
-anyhow = { version = "1.0.102", features = ["backtrace"], optional = true }
+anyhow = { version = "1.0.103", features = ["backtrace"], optional = true }
 clap = { version = "4.5.61", features = [
  "derive",
  "env",

prqlc/prqlc/src/cli/mod.rs

@@ -600,7 +600,7 @@ pub fn write_log(path: &std::path::Path) -> Result<()> {
 }
 
 fn drop_module_def(stmts: &mut Vec<pr::Stmt>, name: &str) {
- stmts.retain(|x| x.kind.as_module_def().map_or(true, |m| m.name != name));
+ stmts.retain(|x| x.kind.as_module_def().is_none_or(|m| m.name != name));
 }
 
 fn read_files(input: &mut clio::ClioPath) -> Result<SourceTree> {
@@ -673,10 +673,47 @@ fn combine_prql_and_frames(source: &str, frames: Vec<(Option<pr::Span>, pl::Line
 /// are in `prqlc/prqlc/src/cli/test.rs`.
 #[cfg(test)]
 mod tests {
- use insta::assert_snapshot;
+ use insta::{assert_debug_snapshot, assert_snapshot};
 
  use super::*;
 
+ #[test]
+ fn drop_named_module_def() {
+ let module = |name: &str| {
+ pr::Stmt::new(pr::StmtKind::ModuleDef(pr::ModuleDef {
+ name: name.to_string(),
+ stmts: Vec::new(),
+ }))
+ };
+ let mut stmts = vec![
+ module("std"),
+ module("user"),
+ pr::Stmt::new(pr::StmtKind::VarDef(pr::VarDef {
+ kind: pr::VarDefKind::Let,
+ name: "value".to_string(),
+ value: None,
+ ty: None,
+ })),
+ ];
+
+ drop_module_def(&mut stmts, "std");
+
+ let remaining = stmts
+ .iter()
+ .map(|stmt| {
+ stmt.kind
+ .as_module_def()
+ .map_or("<non-module>", |module| module.name.as_str())
+ })
+ .collect::<Vec<_>>();
+ assert_debug_snapshot!(remaining, @r#"
+ [
+ "user",
+ "<non-module>",
+ ]
+ "#);
+ }
+
  #[test]
  fn layouts() {
  let output = Command::execute(

prqlc/prqlc/src/cli/snapshots/prqlc__cli__test__shell_completion-2.snap

@@ -7,38 +7,35 @@ info:
  - shell-completion
  - fish
  env:
- CLICOLOR_FORCE: ""
  NO_COLOR: "1"
- RUST_BACKTRACE: ""
- RUST_LOG: ""
 ---
 success: true
 exit_code: 0
 ----- stdout -----
 # Print an optspec for argparse to handle cmd's options that are independent of any subcommand.
 function __fish_prqlc_global_optspecs
-string join \n color= h/help V/version
+string join \n color= h/help V/version
 end
 
 function __fish_prqlc_needs_command
-# Figure out if the current invocation already has a command.
-set -l cmd (commandline -opc)
-set -e cmd[1]
-argparse -s (__fish_prqlc_global_optspecs) -- $cmd 2>/dev/null
-or return
-if set -q argv[1]
-# Also print the command, so this can be used to figure out what it is.
-echo $argv[1]
-return 1
-end
-return 0
+# Figure out if the current invocation already has a command.
+set -l cmd (commandline -opc)
+set -e cmd[1]
+argparse -s (__fish_prqlc_global_optspecs) -- $cmd 2>/dev/null
+or return
+if set -q argv[1]
+# Also print the command, so this can be used to figure out what it is.
+echo $argv[1]
+return 1
+end
+return 0
 end
 
 function __fish_prqlc_using_subcommand
-set -l cmd (__fish_prqlc_needs_command)
-test -z "$cmd"
-and return 1
-contains -- $cmd[1] $argv
+set -l cmd (__fish_prqlc_needs_command)
+test -z "$cmd"
+and return 1
+contains -- $cmd[1] $argv
 end
 
 complete -c prqlc -n "__fish_prqlc_needs_command" -l color -d 'Controls when to use color' -r -f -a "auto\t''

.github/dependabot.yaml

@@ -13,20 +13,6 @@ updates:
  patch:
  update-types:
  - patch
- ignore:
- # `mdbook-core` 0.5.3+ requires `toml ^1.1.2` (0.5.2 needed `toml ^0.9.8`)
- # and `mdbook-preprocessor` 0.5.3 requires `mdbook-core ^0.5.3`; `toml` 1.1
- # requires `indexmap ^2.13`; every `indexmap` from 2.12 on declares
- # `rust-version` >= 1.82, above the project's declared 1.81.0 MSRV. So the
- # bump lands in the workspace lockfile and fails `test-msrv` — it recurred
- # weekly as #6035, #6062, #6132 and #6203, each closed unmerged. Staying on
- # 0.5.2 is a deliberate choice pending an MSRV decision (see #6203). Drop
- # these two entries once `rust-version` in the workspace `Cargo.toml` and
- # `metadata.msrv` in `prqlc/prqlc/Cargo.toml` are raised.
- - dependency-name: "mdbook-core"
- versions: [">= 0.5.3"]
- - dependency-name: "mdbook-preprocessor"
- versions: [">= 0.5.3"]
  # We exclude labels throughout because of https://github.com/dependabot/dependabot-core/issues/7645#issuecomment-1986212847
  labels: []
 

Cargo.toml

@@ -20,7 +20,7 @@ license = "Apache-2.0"
 repository = "https://github.com/PRQL/prql"
 # This isn't tested since `cargo-msrv` doesn't support workspaces; instead we
 # test `metadata.msrv` in `prqlc`
-rust-version = "1.81.0"
+rust-version = "1.85.0"
 version = "0.13.15"
 
 [profile.release]
@@ -44,7 +44,7 @@ allow-branch = ["*"]
 consolidate-commits = true
 
 [workspace.dependencies]
-anyhow = "1.0.102"
+anyhow = "1.0.103"
 arrow = { version = "53", features = [
  "pyarrow",
  "prettyprint",
@@ -59,7 +59,7 @@ pyo3-build-config = "0.27.1"
 schemars = "1.2.1"
 semver = { version = "1.0.28", features = ["serde"] }
 serde = { version = "1.0.228", features = ["derive"] }
-serde_json = "1.0.149"
+serde_json = "1.0.150"
 serde_yaml = { version = "0.9.34" }
 similar = "2.7.0"
 similar-asserts = "1.7.0"

prqlc/prqlc-parser/src/parser/stmt.rs

@@ -270,7 +270,6 @@ where
 
 #[cfg(test)]
 mod tests {
- use chumsky::prelude::*;
  use insta::{assert_debug_snapshot, assert_yaml_snapshot};
 
  use super::*;

prqlc/prqlc/Cargo.toml

@@ -10,7 +10,7 @@ rust-version.workspace = true
 version.workspace = true
 
 # Required for `cargo-msrv`, which doesn't yet support workspaces
-metadata.msrv = "1.81.0"
+metadata.msrv = "1.85.0"
 
 build = "build.rs"
 
@@ -63,7 +63,7 @@ csv = "1.4.0"
 enum-as-inner = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true }
-regex = "1.12.3"
+regex = "1.12.4"
 schemars = { workspace = true }
 semver = { workspace = true }
 # serde is required for the `from_text` feature of PRQL, so we can't really put
@@ -88,7 +88,7 @@ vergen-gitcl = { version = "1.0.8", features = ["build"] }
 
 # unique dependencies from the CLI, marked as optional and included in the 'cli'
 # feature
-anyhow = { version = "1.0.102", features = ["backtrace"], optional = true }
+anyhow = { version = "1.0.103", features = ["backtrace"], optional = true }
 clap = { version = "4.5.61", features = [
  "derive",
  "env",

prqlc/prqlc/src/cli/mod.rs

@@ -600,7 +600,7 @@ pub fn write_log(path: &std::path::Path) -> Result<()> {
 }
 
 fn drop_module_def(stmts: &mut Vec<pr::Stmt>, name: &str) {
- stmts.retain(|x| x.kind.as_module_def().map_or(true, |m| m.name != name));
+ stmts.retain(|x| x.kind.as_module_def().is_none_or(|m| m.name != name));
 }
 
 fn read_files(input: &mut clio::ClioPath) -> Result<SourceTree> {
@@ -673,10 +673,47 @@ fn combine_prql_and_frames(source: &str, frames: Vec<(Option<pr::Span>, pl::Line
 /// are in `prqlc/prqlc/src/cli/test.rs`.
 #[cfg(test)]
 mod tests {
- use insta::assert_snapshot;
+ use insta::{assert_debug_snapshot, assert_snapshot};
 
  use super::*;
 
+ #[test]
+ fn drop_named_module_def() {
+ let module = |name: &str| {
+ pr::Stmt::new(pr::StmtKind::ModuleDef(pr::ModuleDef {
+ name: name.to_string(),
+ stmts: Vec::new(),
+ }))
+ };
+ let mut stmts = vec![
+ module("std"),
+ module("user"),
+ pr::Stmt::new(pr::StmtKind::VarDef(pr::VarDef {
+ kind: pr::VarDefKind::Let,
+ name: "value".to_string(),
+ value: None,
+ ty: None,
+ })),
+ ];
+
+ drop_module_def(&mut stmts, "std");
+
+ let remaining = stmts
+ .iter()
+ .map(|stmt| {
+ stmt.kind
+ .as_module_def()
+ .map_or("<non-module>", |module| module.name.as_str())
+ })
+ .collect::<Vec<_>>();
+ assert_debug_snapshot!(remaining, @r#"
+ [
+ "user",
+ "<non-module>",
+ ]
+ "#);
+ }
+
  #[test]
  fn layouts() {
  let output = Command::execute(

prqlc/prqlc/src/cli/snapshots/prqlc__cli__test__shell_completion-2.snap

@@ -7,38 +7,35 @@ info:
  - shell-completion
  - fish
  env:
- CLICOLOR_FORCE: ""
  NO_COLOR: "1"
- RUST_BACKTRACE: ""
- RUST_LOG: ""
 ---
 success: true
 exit_code: 0
 ----- stdout -----
 # Print an optspec for argparse to handle cmd's options that are independent of any subcommand.
 function __fish_prqlc_global_optspecs
-string join \n color= h/help V/version
+string join \n color= h/help V/version
 end
 
 function __fish_prqlc_needs_command
-# Figure out if the current invocation already has a command.
-set -l cmd (commandline -opc)
-set -e cmd[1]
-argparse -s (__fish_prqlc_global_optspecs) -- $cmd 2>/dev/null
-or return
-if set -q argv[1]
-# Also print the command, so this can be used to figure out what it is.
-echo $argv[1]
-return 1
-end
-return 0
+# Figure out if the current invocation already has a command.
+set -l cmd (commandline -opc)
+set -e cmd[1]
+argparse -s (__fish_prqlc_global_optspecs) -- $cmd 2>/dev/null
+or return
+if set -q argv[1]
+# Also print the command, so this can be used to figure out what it is.
+echo $argv[1]
+return 1
+end
+return 0
 end
 
 function __fish_prqlc_using_subcommand
-set -l cmd (__fish_prqlc_needs_command)
-test -z "$cmd"
-and return 1
-contains -- $cmd[1] $argv
+set -l cmd (__fish_prqlc_needs_command)
+test -z "$cmd"
+and return 1
+contains -- $cmd[1] $argv
 end
 
 complete -c prqlc -n "__fish_prqlc_needs_command" -l color -d 'Controls when to use color' -r -f -a "auto\t''

.github/dependabot.yaml

@@ -13,20 +13,6 @@ updates:
  patch:
  update-types:
  - patch
- ignore:
- # `mdbook-core` 0.5.3+ requires `toml ^1.1.2` (0.5.2 needed `toml ^0.9.8`)
- # and `mdbook-preprocessor` 0.5.3 requires `mdbook-core ^0.5.3`; `toml` 1.1
- # requires `indexmap ^2.13`; every `indexmap` from 2.12 on declares
- # `rust-version` >= 1.82, above the project's declared 1.81.0 MSRV. So the
- # bump lands in the workspace lockfile and fails `test-msrv` — it recurred
- # weekly as #6035, #6062, #6132 and #6203, each closed unmerged. Staying on
- # 0.5.2 is a deliberate choice pending an MSRV decision (see #6203). Drop
- # these two entries once `rust-version` in the workspace `Cargo.toml` and
- # `metadata.msrv` in `prqlc/prqlc/Cargo.toml` are raised.
- - dependency-name: "mdbook-core"
- versions: [">= 0.5.3"]
- - dependency-name: "mdbook-preprocessor"
- versions: [">= 0.5.3"]
  # We exclude labels throughout because of https://github.com/dependabot/dependabot-core/issues/7645#issuecomment-1986212847
  labels: []
 

Cargo.toml

@@ -20,7 +20,7 @@ license = "Apache-2.0"
 repository = "https://github.com/PRQL/prql"
 # This isn't tested since `cargo-msrv` doesn't support workspaces; instead we
 # test `metadata.msrv` in `prqlc`
-rust-version = "1.81.0"
+rust-version = "1.85.0"
 version = "0.13.15"
 
 [profile.release]
@@ -44,7 +44,7 @@ allow-branch = ["*"]
 consolidate-commits = true
 
 [workspace.dependencies]
-anyhow = "1.0.102"
+anyhow = "1.0.103"
 arrow = { version = "53", features = [
  "pyarrow",
  "prettyprint",
@@ -59,7 +59,7 @@ pyo3-build-config = "0.27.1"
 schemars = "1.2.1"
 semver = { version = "1.0.28", features = ["serde"] }
 serde = { version = "1.0.228", features = ["derive"] }
-serde_json = "1.0.149"
+serde_json = "1.0.150"
 serde_yaml = { version = "0.9.34" }
 similar = "2.7.0"
 similar-asserts = "1.7.0"

prqlc/prqlc-parser/src/parser/stmt.rs

@@ -270,7 +270,6 @@ where
 
 #[cfg(test)]
 mod tests {
- use chumsky::prelude::*;
  use insta::{assert_debug_snapshot, assert_yaml_snapshot};
 
  use super::*;

prqlc/prqlc/Cargo.toml

@@ -10,7 +10,7 @@ rust-version.workspace = true
 version.workspace = true
 
 # Required for `cargo-msrv`, which doesn't yet support workspaces
-metadata.msrv = "1.81.0"
+metadata.msrv = "1.85.0"
 
 build = "build.rs"
 
@@ -63,7 +63,7 @@ csv = "1.4.0"
 enum-as-inner = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true }
-regex = "1.12.3"
+regex = "1.12.4"
 schemars = { workspace = true }
 semver = { workspace = true }
 # serde is required for the `from_text` feature of PRQL, so we can't really put
@@ -88,7 +88,7 @@ vergen-gitcl = { version = "1.0.8", features = ["build"] }
 
 # unique dependencies from the CLI, marked as optional and included in the 'cli'
 # feature
-anyhow = { version = "1.0.102", features = ["backtrace"], optional = true }
+anyhow = { version = "1.0.103", features = ["backtrace"], optional = true }
 clap = { version = "4.5.61", features = [
  "derive",
  "env",

prqlc/prqlc/src/cli/mod.rs

@@ -600,7 +600,7 @@ pub fn write_log(path: &std::path::Path) -> Result<()> {
 }
 
 fn drop_module_def(stmts: &mut Vec<pr::Stmt>, name: &str) {
- stmts.retain(|x| x.kind.as_module_def().map_or(true, |m| m.name != name));
+ stmts.retain(|x| x.kind.as_module_def().is_none_or(|m| m.name != name));
 }
 
 fn read_files(input: &mut clio::ClioPath) -> Result<SourceTree> {
@@ -673,10 +673,47 @@ fn combine_prql_and_frames(source: &str, frames: Vec<(Option<pr::Span>, pl::Line
 /// are in `prqlc/prqlc/src/cli/test.rs`.
 #[cfg(test)]
 mod tests {
- use insta::assert_snapshot;
+ use insta::{assert_debug_snapshot, assert_snapshot};
 
  use super::*;
 
+ #[test]
+ fn drop_named_module_def() {
+ let module = |name: &str| {
+ pr::Stmt::new(pr::StmtKind::ModuleDef(pr::ModuleDef {
+ name: name.to_string(),
+ stmts: Vec::new(),
+ }))
+ };
+ let mut stmts = vec![
+ module("std"),
+ module("user"),
+ pr::Stmt::new(pr::StmtKind::VarDef(pr::VarDef {
+ kind: pr::VarDefKind::Let,
+ name: "value".to_string(),
+ value: None,
+ ty: None,
+ })),
+ ];
+
+ drop_module_def(&mut stmts, "std");
+
+ let remaining = stmts
+ .iter()
+ .map(|stmt| {
+ stmt.kind
+ .as_module_def()
+ .map_or("<non-module>", |module| module.name.as_str())
+ })
+ .collect::<Vec<_>>();
+ assert_debug_snapshot!(remaining, @r#"
+ [
+ "user",
+ "<non-module>",
+ ]
+ "#);
+ }
+
  #[test]
  fn layouts() {
  let output = Command::execute(

prqlc/prqlc/src/cli/snapshots/prqlc__cli__test__shell_completion-2.snap

@@ -7,38 +7,35 @@ info:
  - shell-completion
  - fish
  env:
- CLICOLOR_FORCE: ""
  NO_COLOR: "1"
- RUST_BACKTRACE: ""
- RUST_LOG: ""
 ---
 success: true
 exit_code: 0
 ----- stdout -----
 # Print an optspec for argparse to handle cmd's options that are independent of any subcommand.
 function __fish_prqlc_global_optspecs
-string join \n color= h/help V/version
+string join \n color= h/help V/version
 end
 
 function __fish_prqlc_needs_command
-# Figure out if the current invocation already has a command.
-set -l cmd (commandline -opc)
-set -e cmd[1]
-argparse -s (__fish_prqlc_global_optspecs) -- $cmd 2>/dev/null
-or return
-if set -q argv[1]
-# Also print the command, so this can be used to figure out what it is.
-echo $argv[1]
-return 1
-end
-return 0
+# Figure out if the current invocation already has a command.
+set -l cmd (commandline -opc)
+set -e cmd[1]
+argparse -s (__fish_prqlc_global_optspecs) -- $cmd 2>/dev/null
+or return
+if set -q argv[1]
+# Also print the command, so this can be used to figure out what it is.
+echo $argv[1]
+return 1
+end
+return 0
 end
 
 function __fish_prqlc_using_subcommand
-set -l cmd (__fish_prqlc_needs_command)
-test -z "$cmd"
-and return 1
-contains -- $cmd[1] $argv
+set -l cmd (__fish_prqlc_needs_command)
+test -z "$cmd"
+and return 1
+contains -- $cmd[1] $argv
 end
 
 complete -c prqlc -n "__fish_prqlc_needs_command" -l color -d 'Controls when to use color' -r -f -a "auto\t''

.github/dependabot.yaml

@@ -13,20 +13,6 @@ updates:
  patch:
  update-types:
  - patch
- ignore:
- # `mdbook-core` 0.5.3+ requires `toml ^1.1.2` (0.5.2 needed `toml ^0.9.8`)
- # and `mdbook-preprocessor` 0.5.3 requires `mdbook-core ^0.5.3`; `toml` 1.1
- # requires `indexmap ^2.13`; every `indexmap` from 2.12 on declares
- # `rust-version` >= 1.82, above the project's declared 1.81.0 MSRV. So the
- # bump lands in the workspace lockfile and fails `test-msrv` — it recurred
- # weekly as #6035, #6062, #6132 and #6203, each closed unmerged. Staying on
- # 0.5.2 is a deliberate choice pending an MSRV decision (see #6203). Drop
- # these two entries once `rust-version` in the workspace `Cargo.toml` and
- # `metadata.msrv` in `prqlc/prqlc/Cargo.toml` are raised.
- - dependency-name: "mdbook-core"
- versions: [">= 0.5.3"]
- - dependency-name: "mdbook-preprocessor"
- versions: [">= 0.5.3"]
  # We exclude labels throughout because of https://github.com/dependabot/dependabot-core/issues/7645#issuecomment-1986212847
  labels: []
 

Cargo.toml

@@ -20,7 +20,7 @@ license = "Apache-2.0"
 repository = "https://github.com/PRQL/prql"
 # This isn't tested since `cargo-msrv` doesn't support workspaces; instead we
 # test `metadata.msrv` in `prqlc`
-rust-version = "1.81.0"
+rust-version = "1.85.0"
 version = "0.13.15"
 
 [profile.release]
@@ -44,7 +44,7 @@ allow-branch = ["*"]
 consolidate-commits = true
 
 [workspace.dependencies]
-anyhow = "1.0.102"
+anyhow = "1.0.103"
 arrow = { version = "53", features = [
  "pyarrow",
  "prettyprint",
@@ -59,7 +59,7 @@ pyo3-build-config = "0.27.1"
 schemars = "1.2.1"
 semver = { version = "1.0.28", features = ["serde"] }
 serde = { version = "1.0.228", features = ["derive"] }
-serde_json = "1.0.149"
+serde_json = "1.0.150"
 serde_yaml = { version = "0.9.34" }
 similar = "2.7.0"
 similar-asserts = "1.7.0"

prqlc/prqlc-parser/src/parser/stmt.rs

@@ -270,7 +270,6 @@ where
 
 #[cfg(test)]
 mod tests {
- use chumsky::prelude::*;
  use insta::{assert_debug_snapshot, assert_yaml_snapshot};
 
  use super::*;

prqlc/prqlc/Cargo.toml

@@ -10,7 +10,7 @@ rust-version.workspace = true
 version.workspace = true
 
 # Required for `cargo-msrv`, which doesn't yet support workspaces
-metadata.msrv = "1.81.0"
+metadata.msrv = "1.85.0"
 
 build = "build.rs"
 
@@ -63,7 +63,7 @@ csv = "1.4.0"
 enum-as-inner = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true }
-regex = "1.12.3"
+regex = "1.12.4"
 schemars = { workspace = true }
 semver = { workspace = true }
 # serde is required for the `from_text` feature of PRQL, so we can't really put
@@ -88,7 +88,7 @@ vergen-gitcl = { version = "1.0.8", features = ["build"] }
 
 # unique dependencies from the CLI, marked as optional and included in the 'cli'
 # feature
-anyhow = { version = "1.0.102", features = ["backtrace"], optional = true }
+anyhow = { version = "1.0.103", features = ["backtrace"], optional = true }
 clap = { version = "4.5.61", features = [
  "derive",
  "env",

prqlc/prqlc/src/cli/mod.rs

@@ -600,7 +600,7 @@ pub fn write_log(path: &std::path::Path) -> Result<()> {
 }
 
 fn drop_module_def(stmts: &mut Vec<pr::Stmt>, name: &str) {
- stmts.retain(|x| x.kind.as_module_def().map_or(true, |m| m.name != name));
+ stmts.retain(|x| x.kind.as_module_def().is_none_or(|m| m.name != name));
 }
 
 fn read_files(input: &mut clio::ClioPath) -> Result<SourceTree> {
@@ -673,10 +673,47 @@ fn combine_prql_and_frames(source: &str, frames: Vec<(Option<pr::Span>, pl::Line
 /// are in `prqlc/prqlc/src/cli/test.rs`.
 #[cfg(test)]
 mod tests {
- use insta::assert_snapshot;
+ use insta::{assert_debug_snapshot, assert_snapshot};
 
  use super::*;
 
+ #[test]
+ fn drop_named_module_def() {
+ let module = |name: &str| {
+ pr::Stmt::new(pr::StmtKind::ModuleDef(pr::ModuleDef {
+ name: name.to_string(),
+ stmts: Vec::new(),
+ }))
+ };
+ let mut stmts = vec![
+ module("std"),
+ module("user"),
+ pr::Stmt::new(pr::StmtKind::VarDef(pr::VarDef {
+ kind: pr::VarDefKind::Let,
+ name: "value".to_string(),
+ value: None,
+ ty: None,
+ })),
+ ];
+
+ drop_module_def(&mut stmts, "std");
+
+ let remaining = stmts
+ .iter()
+ .map(|stmt| {
+ stmt.kind
+ .as_module_def()
+ .map_or("<non-module>", |module| module.name.as_str())
+ })
+ .collect::<Vec<_>>();
+ assert_debug_snapshot!(remaining, @r#"
+ [
+ "user",
+ "<non-module>",
+ ]
+ "#);
+ }
+
  #[test]
  fn layouts() {
  let output = Command::execute(

prqlc/prqlc/src/cli/snapshots/prqlc__cli__test__shell_completion-2.snap

@@ -7,38 +7,35 @@ info:
  - shell-completion
  - fish
  env:
- CLICOLOR_FORCE: ""
  NO_COLOR: "1"
- RUST_BACKTRACE: ""
- RUST_LOG: ""
 ---
 success: true
 exit_code: 0
 ----- stdout -----
 # Print an optspec for argparse to handle cmd's options that are independent of any subcommand.
 function __fish_prqlc_global_optspecs
-string join \n color= h/help V/version
+string join \n color= h/help V/version
 end
 
 function __fish_prqlc_needs_command
-# Figure out if the current invocation already has a command.
-set -l cmd (commandline -opc)
-set -e cmd[1]
-argparse -s (__fish_prqlc_global_optspecs) -- $cmd 2>/dev/null
-or return
-if set -q argv[1]
-# Also print the command, so this can be used to figure out what it is.
-echo $argv[1]
-return 1
-end
-return 0
+# Figure out if the current invocation already has a command.
+set -l cmd (commandline -opc)
+set -e cmd[1]
+argparse -s (__fish_prqlc_global_optspecs) -- $cmd 2>/dev/null
+or return
+if set -q argv[1]
+# Also print the command, so this can be used to figure out what it is.
+echo $argv[1]
+return 1
+end
+return 0
 end
 
 function __fish_prqlc_using_subcommand
-set -l cmd (__fish_prqlc_needs_command)
-test -z "$cmd"
-and return 1
-contains -- $cmd[1] $argv
+set -l cmd (__fish_prqlc_needs_command)
+test -z "$cmd"
+and return 1
+contains -- $cmd[1] $argv
 end
 
 complete -c prqlc -n "__fish_prqlc_needs_command" -l color -d 'Controls when to use color' -r -f -a "auto\t''

.github/dependabot.yaml

@@ -13,20 +13,6 @@ updates:
  patch:
  update-types:
  - patch
- ignore:
- # `mdbook-core` 0.5.3+ requires `toml ^1.1.2` (0.5.2 needed `toml ^0.9.8`)
- # and `mdbook-preprocessor` 0.5.3 requires `mdbook-core ^0.5.3`; `toml` 1.1
- # requires `indexmap ^2.13`; every `indexmap` from 2.12 on declares
- # `rust-version` >= 1.82, above the project's declared 1.81.0 MSRV. So the
- # bump lands in the workspace lockfile and fails `test-msrv` — it recurred
- # weekly as #6035, #6062, #6132 and #6203, each closed unmerged. Staying on
- # 0.5.2 is a deliberate choice pending an MSRV decision (see #6203). Drop
- # these two entries once `rust-version` in the workspace `Cargo.toml` and
- # `metadata.msrv` in `prqlc/prqlc/Cargo.toml` are raised.
- - dependency-name: "mdbook-core"
- versions: [">= 0.5.3"]
- - dependency-name: "mdbook-preprocessor"
- versions: [">= 0.5.3"]
  # We exclude labels throughout because of https://github.com/dependabot/dependabot-core/issues/7645#issuecomment-1986212847
  labels: []
 

Cargo.toml

@@ -20,7 +20,7 @@ license = "Apache-2.0"
 repository = "https://github.com/PRQL/prql"
 # This isn't tested since `cargo-msrv` doesn't support workspaces; instead we
 # test `metadata.msrv` in `prqlc`
-rust-version = "1.81.0"
+rust-version = "1.85.0"
 version = "0.13.15"
 
 [profile.release]
@@ -44,7 +44,7 @@ allow-branch = ["*"]
 consolidate-commits = true
 
 [workspace.dependencies]
-anyhow = "1.0.102"
+anyhow = "1.0.103"
 arrow = { version = "53", features = [
  "pyarrow",
  "prettyprint",
@@ -59,7 +59,7 @@ pyo3-build-config = "0.27.1"
 schemars = "1.2.1"
 semver = { version = "1.0.28", features = ["serde"] }
 serde = { version = "1.0.228", features = ["derive"] }
-serde_json = "1.0.149"
+serde_json = "1.0.150"
 serde_yaml = { version = "0.9.34" }
 similar = "2.7.0"
 similar-asserts = "1.7.0"

prqlc/prqlc-parser/src/parser/stmt.rs

@@ -270,7 +270,6 @@ where
 
 #[cfg(test)]
 mod tests {
- use chumsky::prelude::*;
  use insta::{assert_debug_snapshot, assert_yaml_snapshot};
 
  use super::*;

prqlc/prqlc/Cargo.toml

@@ -10,7 +10,7 @@ rust-version.workspace = true
 version.workspace = true
 
 # Required for `cargo-msrv`, which doesn't yet support workspaces
-metadata.msrv = "1.81.0"
+metadata.msrv = "1.85.0"
 
 build = "build.rs"
 
@@ -63,7 +63,7 @@ csv = "1.4.0"
 enum-as-inner = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true }
-regex = "1.12.3"
+regex = "1.12.4"
 schemars = { workspace = true }
 semver = { workspace = true }
 # serde is required for the `from_text` feature of PRQL, so we can't really put
@@ -88,7 +88,7 @@ vergen-gitcl = { version = "1.0.8", features = ["build"] }
 
 # unique dependencies from the CLI, marked as optional and included in the 'cli'
 # feature
-anyhow = { version = "1.0.102", features = ["backtrace"], optional = true }
+anyhow = { version = "1.0.103", features = ["backtrace"], optional = true }
 clap = { version = "4.5.61", features = [
  "derive",
  "env",

prqlc/prqlc/src/cli/mod.rs

@@ -600,7 +600,7 @@ pub fn write_log(path: &std::path::Path) -> Result<()> {
 }
 
 fn drop_module_def(stmts: &mut Vec<pr::Stmt>, name: &str) {
- stmts.retain(|x| x.kind.as_module_def().map_or(true, |m| m.name != name));
+ stmts.retain(|x| x.kind.as_module_def().is_none_or(|m| m.name != name));
 }
 
 fn read_files(input: &mut clio::ClioPath) -> Result<SourceTree> {
@@ -673,10 +673,47 @@ fn combine_prql_and_frames(source: &str, frames: Vec<(Option<pr::Span>, pl::Line
 /// are in `prqlc/prqlc/src/cli/test.rs`.
 #[cfg(test)]
 mod tests {
- use insta::assert_snapshot;
+ use insta::{assert_debug_snapshot, assert_snapshot};
 
  use super::*;
 
+ #[test]
+ fn drop_named_module_def() {
+ let module = |name: &str| {
+ pr::Stmt::new(pr::StmtKind::ModuleDef(pr::ModuleDef {
+ name: name.to_string(),
+ stmts: Vec::new(),
+ }))
+ };
+ let mut stmts = vec![
+ module("std"),
+ module("user"),
+ pr::Stmt::new(pr::StmtKind::VarDef(pr::VarDef {
+ kind: pr::VarDefKind::Let,
+ name: "value".to_string(),
+ value: None,
+ ty: None,
+ })),
+ ];
+
+ drop_module_def(&mut stmts, "std");
+
+ let remaining = stmts
+ .iter()
+ .map(|stmt| {
+ stmt.kind
+ .as_module_def()
+ .map_or("<non-module>", |module| module.name.as_str())
+ })
+ .collect::<Vec<_>>();
+ assert_debug_snapshot!(remaining, @r#"
+ [
+ "user",
+ "<non-module>",
+ ]
+ "#);
+ }
+
  #[test]
  fn layouts() {
  let output = Command::execute(

prqlc/prqlc/src/cli/snapshots/prqlc__cli__test__shell_completion-2.snap

@@ -7,38 +7,35 @@ info:
  - shell-completion
  - fish
  env:
- CLICOLOR_FORCE: ""
  NO_COLOR: "1"
- RUST_BACKTRACE: ""
- RUST_LOG: ""
 ---
 success: true
 exit_code: 0
 ----- stdout -----
 # Print an optspec for argparse to handle cmd's options that are independent of any subcommand.
 function __fish_prqlc_global_optspecs
-string join \n color= h/help V/version
+string join \n color= h/help V/version
 end
 
 function __fish_prqlc_needs_command
-# Figure out if the current invocation already has a command.
-set -l cmd (commandline -opc)
-set -e cmd[1]
-argparse -s (__fish_prqlc_global_optspecs) -- $cmd 2>/dev/null
-or return
-if set -q argv[1]
-# Also print the command, so this can be used to figure out what it is.
-echo $argv[1]
-return 1
-end
-return 0
+# Figure out if the current invocation already has a command.
+set -l cmd (commandline -opc)
+set -e cmd[1]
+argparse -s (__fish_prqlc_global_optspecs) -- $cmd 2>/dev/null
+or return
+if set -q argv[1]
+# Also print the command, so this can be used to figure out what it is.
+echo $argv[1]
+return 1
+end
+return 0
 end
 
 function __fish_prqlc_using_subcommand
-set -l cmd (__fish_prqlc_needs_command)
-test -z "$cmd"
-and return 1
-contains -- $cmd[1] $argv
+set -l cmd (__fish_prqlc_needs_command)
+test -z "$cmd"
+and return 1
+contains -- $cmd[1] $argv
 end
 
 complete -c prqlc -n "__fish_prqlc_needs_command" -l color -d 'Controls when to use color' -r -f -a "auto\t''

.github/dependabot.yaml

@@ -13,20 +13,6 @@ updates:
  patch:
  update-types:
  - patch
- ignore:
- # `mdbook-core` 0.5.3+ requires `toml ^1.1.2` (0.5.2 needed `toml ^0.9.8`)
- # and `mdbook-preprocessor` 0.5.3 requires `mdbook-core ^0.5.3`; `toml` 1.1
- # requires `indexmap ^2.13`; every `indexmap` from 2.12 on declares
- # `rust-version` >= 1.82, above the project's declared 1.81.0 MSRV. So the
- # bump lands in the workspace lockfile and fails `test-msrv` — it recurred
- # weekly as #6035, #6062, #6132 and #6203, each closed unmerged. Staying on
- # 0.5.2 is a deliberate choice pending an MSRV decision (see #6203). Drop
- # these two entries once `rust-version` in the workspace `Cargo.toml` and
- # `metadata.msrv` in `prqlc/prqlc/Cargo.toml` are raised.
- - dependency-name: "mdbook-core"
- versions: [">= 0.5.3"]
- - dependency-name: "mdbook-preprocessor"
- versions: [">= 0.5.3"]
  # We exclude labels throughout because of https://github.com/dependabot/dependabot-core/issues/7645#issuecomment-1986212847
  labels: []
 

Cargo.toml

@@ -20,7 +20,7 @@ license = "Apache-2.0"
 repository = "https://github.com/PRQL/prql"
 # This isn't tested since `cargo-msrv` doesn't support workspaces; instead we
 # test `metadata.msrv` in `prqlc`
-rust-version = "1.81.0"
+rust-version = "1.85.0"
 version = "0.13.15"
 
 [profile.release]
@@ -44,7 +44,7 @@ allow-branch = ["*"]
 consolidate-commits = true
 
 [workspace.dependencies]
-anyhow = "1.0.102"
+anyhow = "1.0.103"
 arrow = { version = "53", features = [
  "pyarrow",
  "prettyprint",
@@ -59,7 +59,7 @@ pyo3-build-config = "0.27.1"
 schemars = "1.2.1"
 semver = { version = "1.0.28", features = ["serde"] }
 serde = { version = "1.0.228", features = ["derive"] }
-serde_json = "1.0.149"
+serde_json = "1.0.150"
 serde_yaml = { version = "0.9.34" }
 similar = "2.7.0"
 similar-asserts = "1.7.0"

prqlc/prqlc-parser/src/parser/stmt.rs

@@ -270,7 +270,6 @@ where
 
 #[cfg(test)]
 mod tests {
- use chumsky::prelude::*;
  use insta::{assert_debug_snapshot, assert_yaml_snapshot};
 
  use super::*;

prqlc/prqlc/Cargo.toml

@@ -10,7 +10,7 @@ rust-version.workspace = true
 version.workspace = true
 
 # Required for `cargo-msrv`, which doesn't yet support workspaces
-metadata.msrv = "1.81.0"
+metadata.msrv = "1.85.0"
 
 build = "build.rs"
 
@@ -63,7 +63,7 @@ csv = "1.4.0"
 enum-as-inner = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true }
-regex = "1.12.3"
+regex = "1.12.4"
 schemars = { workspace = true }
 semver = { workspace = true }
 # serde is required for the `from_text` feature of PRQL, so we can't really put
@@ -88,7 +88,7 @@ vergen-gitcl = { version = "1.0.8", features = ["build"] }
 
 # unique dependencies from the CLI, marked as optional and included in the 'cli'
 # feature
-anyhow = { version = "1.0.102", features = ["backtrace"], optional = true }
+anyhow = { version = "1.0.103", features = ["backtrace"], optional = true }
 clap = { version = "4.5.61", features = [
  "derive",
  "env",

prqlc/prqlc/src/cli/mod.rs

@@ -600,7 +600,7 @@ pub fn write_log(path: &std::path::Path) -> Result<()> {
 }
 
 fn drop_module_def(stmts: &mut Vec<pr::Stmt>, name: &str) {
- stmts.retain(|x| x.kind.as_module_def().map_or(true, |m| m.name != name));
+ stmts.retain(|x| x.kind.as_module_def().is_none_or(|m| m.name != name));
 }
 
 fn read_files(input: &mut clio::ClioPath) -> Result<SourceTree> {
@@ -673,10 +673,47 @@ fn combine_prql_and_frames(source: &str, frames: Vec<(Option<pr::Span>, pl::Line
 /// are in `prqlc/prqlc/src/cli/test.rs`.
 #[cfg(test)]
 mod tests {
- use insta::assert_snapshot;
+ use insta::{assert_debug_snapshot, assert_snapshot};
 
  use super::*;
 
+ #[test]
+ fn drop_named_module_def() {
+ let module = |name: &str| {
+ pr::Stmt::new(pr::StmtKind::ModuleDef(pr::ModuleDef {
+ name: name.to_string(),
+ stmts: Vec::new(),
+ }))
+ };
+ let mut stmts = vec![
+ module("std"),
+ module("user"),
+ pr::Stmt::new(pr::StmtKind::VarDef(pr::VarDef {
+ kind: pr::VarDefKind::Let,
+ name: "value".to_string(),
+ value: None,
+ ty: None,
+ })),
+ ];
+
+ drop_module_def(&mut stmts, "std");
+
+ let remaining = stmts
+ .iter()
+ .map(|stmt| {
+ stmt.kind
+ .as_module_def()
+ .map_or("<non-module>", |module| module.name.as_str())
+ })
+ .collect::<Vec<_>>();
+ assert_debug_snapshot!(remaining, @r#"
+ [
+ "user",
+ "<non-module>",
+ ]
+ "#);
+ }
+
  #[test]
  fn layouts() {
  let output = Command::execute(

prqlc/prqlc/src/cli/snapshots/prqlc__cli__test__shell_completion-2.snap

@@ -7,38 +7,35 @@ info:
  - shell-completion
  - fish
  env:
- CLICOLOR_FORCE: ""
  NO_COLOR: "1"
- RUST_BACKTRACE: ""
- RUST_LOG: ""
 ---
 success: true
 exit_code: 0
 ----- stdout -----
 # Print an optspec for argparse to handle cmd's options that are independent of any subcommand.
 function __fish_prqlc_global_optspecs
-string join \n color= h/help V/version
+string join \n color= h/help V/version
 end
 
 function __fish_prqlc_needs_command
-# Figure out if the current invocation already has a command.
-set -l cmd (commandline -opc)
-set -e cmd[1]
-argparse -s (__fish_prqlc_global_optspecs) -- $cmd 2>/dev/null
-or return
-if set -q argv[1]
-# Also print the command, so this can be used to figure out what it is.
-echo $argv[1]
-return 1
-end
-return 0
+# Figure out if the current invocation already has a command.
+set -l cmd (commandline -opc)
+set -e cmd[1]
+argparse -s (__fish_prqlc_global_optspecs) -- $cmd 2>/dev/null
+or return
+if set -q argv[1]
+# Also print the command, so this can be used to figure out what it is.
+echo $argv[1]
+return 1
+end
+return 0
 end
 
 function __fish_prqlc_using_subcommand
-set -l cmd (__fish_prqlc_needs_command)
-test -z "$cmd"
-and return 1
-contains -- $cmd[1] $argv
+set -l cmd (__fish_prqlc_needs_command)
+test -z "$cmd"
+and return 1
+contains -- $cmd[1] $argv
 end
 
 complete -c prqlc -n "__fish_prqlc_needs_command" -l color -d 'Controls when to use color' -r -f -a "auto\t''

.github/dependabot.yaml

@@ -13,20 +13,6 @@ updates:
  patch:
  update-types:
  - patch
- ignore:
- # `mdbook-core` 0.5.3+ requires `toml ^1.1.2` (0.5.2 needed `toml ^0.9.8`)
- # and `mdbook-preprocessor` 0.5.3 requires `mdbook-core ^0.5.3`; `toml` 1.1
- # requires `indexmap ^2.13`; every `indexmap` from 2.12 on declares
- # `rust-version` >= 1.82, above the project's declared 1.81.0 MSRV. So the
- # bump lands in the workspace lockfile and fails `test-msrv` — it recurred
- # weekly as #6035, #6062, #6132 and #6203, each closed unmerged. Staying on
- # 0.5.2 is a deliberate choice pending an MSRV decision (see #6203). Drop
- # these two entries once `rust-version` in the workspace `Cargo.toml` and
- # `metadata.msrv` in `prqlc/prqlc/Cargo.toml` are raised.
- - dependency-name: "mdbook-core"
- versions: [">= 0.5.3"]
- - dependency-name: "mdbook-preprocessor"
- versions: [">= 0.5.3"]
  # We exclude labels throughout because of https://github.com/dependabot/dependabot-core/issues/7645#issuecomment-1986212847
  labels: []
 

Cargo.toml

@@ -20,7 +20,7 @@ license = "Apache-2.0"
 repository = "https://github.com/PRQL/prql"
 # This isn't tested since `cargo-msrv` doesn't support workspaces; instead we
 # test `metadata.msrv` in `prqlc`
-rust-version = "1.81.0"
+rust-version = "1.85.0"
 version = "0.13.15"
 
 [profile.release]
@@ -44,7 +44,7 @@ allow-branch = ["*"]
 consolidate-commits = true
 
 [workspace.dependencies]
-anyhow = "1.0.102"
+anyhow = "1.0.103"
 arrow = { version = "53", features = [
  "pyarrow",
  "prettyprint",
@@ -59,7 +59,7 @@ pyo3-build-config = "0.27.1"
 schemars = "1.2.1"
 semver = { version = "1.0.28", features = ["serde"] }
 serde = { version = "1.0.228", features = ["derive"] }
-serde_json = "1.0.149"
+serde_json = "1.0.150"
 serde_yaml = { version = "0.9.34" }
 similar = "2.7.0"
 similar-asserts = "1.7.0"

prqlc/prqlc-parser/src/parser/stmt.rs

@@ -270,7 +270,6 @@ where
 
 #[cfg(test)]
 mod tests {
- use chumsky::prelude::*;
  use insta::{assert_debug_snapshot, assert_yaml_snapshot};
 
  use super::*;

prqlc/prqlc/Cargo.toml

@@ -10,7 +10,7 @@ rust-version.workspace = true
 version.workspace = true
 
 # Required for `cargo-msrv`, which doesn't yet support workspaces
-metadata.msrv = "1.81.0"
+metadata.msrv = "1.85.0"
 
 build = "build.rs"
 
@@ -63,7 +63,7 @@ csv = "1.4.0"
 enum-as-inner = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true }
-regex = "1.12.3"
+regex = "1.12.4"
 schemars = { workspace = true }
 semver = { workspace = true }
 # serde is required for the `from_text` feature of PRQL, so we can't really put
@@ -88,7 +88,7 @@ vergen-gitcl = { version = "1.0.8", features = ["build"] }
 
 # unique dependencies from the CLI, marked as optional and included in the 'cli'
 # feature
-anyhow = { version = "1.0.102", features = ["backtrace"], optional = true }
+anyhow = { version = "1.0.103", features = ["backtrace"], optional = true }
 clap = { version = "4.5.61", features = [
  "derive",
  "env",

prqlc/prqlc/src/cli/mod.rs

@@ -600,7 +600,7 @@ pub fn write_log(path: &std::path::Path) -> Result<()> {
 }
 
 fn drop_module_def(stmts: &mut Vec<pr::Stmt>, name: &str) {
- stmts.retain(|x| x.kind.as_module_def().map_or(true, |m| m.name != name));
+ stmts.retain(|x| x.kind.as_module_def().is_none_or(|m| m.name != name));
 }
 
 fn read_files(input: &mut clio::ClioPath) -> Result<SourceTree> {
@@ -673,10 +673,47 @@ fn combine_prql_and_frames(source: &str, frames: Vec<(Option<pr::Span>, pl::Line
 /// are in `prqlc/prqlc/src/cli/test.rs`.
 #[cfg(test)]
 mod tests {
- use insta::assert_snapshot;
+ use insta::{assert_debug_snapshot, assert_snapshot};
 
  use super::*;
 
+ #[test]
+ fn drop_named_module_def() {
+ let module = |name: &str| {
+ pr::Stmt::new(pr::StmtKind::ModuleDef(pr::ModuleDef {
+ name: name.to_string(),
+ stmts: Vec::new(),
+ }))
+ };
+ let mut stmts = vec![
+ module("std"),
+ module("user"),
+ pr::Stmt::new(pr::StmtKind::VarDef(pr::VarDef {
+ kind: pr::VarDefKind::Let,
+ name: "value".to_string(),
+ value: None,
+ ty: None,
+ })),
+ ];
+
+ drop_module_def(&mut stmts, "std");
+
+ let remaining = stmts
+ .iter()
+ .map(|stmt| {
+ stmt.kind
+ .as_module_def()
+ .map_or("<non-module>", |module| module.name.as_str())
+ })
+ .collect::<Vec<_>>();
+ assert_debug_snapshot!(remaining, @r#"
+ [
+ "user",
+ "<non-module>",
+ ]
+ "#);
+ }
+
  #[test]
  fn layouts() {
  let output = Command::execute(

prqlc/prqlc/src/cli/snapshots/prqlc__cli__test__shell_completion-2.snap

@@ -7,38 +7,35 @@ info:
  - shell-completion
  - fish
  env:
- CLICOLOR_FORCE: ""
  NO_COLOR: "1"
- RUST_BACKTRACE: ""
- RUST_LOG: ""
 ---
 success: true
 exit_code: 0
 ----- stdout -----
 # Print an optspec for argparse to handle cmd's options that are independent of any subcommand.
 function __fish_prqlc_global_optspecs
-string join \n color= h/help V/version
+string join \n color= h/help V/version
 end
 
 function __fish_prqlc_needs_command
-# Figure out if the current invocation already has a command.
-set -l cmd (commandline -opc)
-set -e cmd[1]
-argparse -s (__fish_prqlc_global_optspecs) -- $cmd 2>/dev/null
-or return
-if set -q argv[1]
-# Also print the command, so this can be used to figure out what it is.
-echo $argv[1]
-return 1
-end
-return 0
+# Figure out if the current invocation already has a command.
+set -l cmd (commandline -opc)
+set -e cmd[1]
+argparse -s (__fish_prqlc_global_optspecs) -- $cmd 2>/dev/null
+or return
+if set -q argv[1]
+# Also print the command, so this can be used to figure out what it is.
+echo $argv[1]
+return 1
+end
+return 0
 end
 
 function __fish_prqlc_using_subcommand
-set -l cmd (__fish_prqlc_needs_command)
-test -z "$cmd"
-and return 1
-contains -- $cmd[1] $argv
+set -l cmd (__fish_prqlc_needs_command)
+test -z "$cmd"
+and return 1
+contains -- $cmd[1] $argv
 end
 
 complete -c prqlc -n "__fish_prqlc_needs_command" -l color -d 'Controls when to use color' -r -f -a "auto\t''