Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/cargo/patch-2fc11dfb6c
Browse files Browse the repository at this point in the history
  • Loading branch information
max-sixty committed Jul 1, 2024
2 parents f835d54 + 2d0db5e commit 7468139
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
steps:
- name: 📂 Checkout code
uses: actions/checkout@v4
- run: rustup override set nightly-2023-11-22
- run: rustup override set nightly-2024-06-30
- uses: baptiste0928/cargo-install@v3
with:
crate: cargo-udeps
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ jobs:
steps:
- name: 📂 Checkout code
uses: actions/checkout@v4
- run: rustup override set nightly-2023-11-22
- run: rustup override set nightly-2024-06-30
- uses: baptiste0928/cargo-install@v3
with:
crate: cargo-hack
Expand Down
21 changes: 6 additions & 15 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ anyhow = "1.0.86"
enum-as-inner = "0.6.0"
insta = {version = "1.39.0", features = ["colors", "glob", "yaml"]}
insta-cmd = "0.6.0"
itertools = "0.12.0"
itertools = "0.13.0"
log = "0.4.22"
semver = {version = "1.0.23", features = ["serde"]}
serde = {version = "1.0.203", features = ["derive"]}
Expand Down
1 change: 0 additions & 1 deletion prqlc/bindings/prqlc-python/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ pub fn get_targets() -> Vec<String> {
prqlc_lib::Target::names()
}

#[cfg(not(feature = "extension-module"))]
#[cfg(test)]
mod test {
use insta::assert_snapshot;
Expand Down
2 changes: 1 addition & 1 deletion prqlc/prqlc-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ version.workspace = true

[lib]
doctest = false
proc_macro = true
proc-macro = true
test = false

[dependencies]
Expand Down
6 changes: 1 addition & 5 deletions prqlc/prqlc/src/sql/gen_query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -473,11 +473,7 @@ pub(super) fn translate_query_sstring(
let string = translate_sstring(items, ctx)?;

let re = Regex::new(r"(?i)^SELECT\b").unwrap();
let prefix = if let Some(string) = string.trim().get(0..7) {
string
} else {
""
};
let prefix = string.trim().get(0..7).unwrap_or_default();

if re.is_match(prefix) {
if let Some(string) = string.trim().strip_prefix(prefix) {
Expand Down
2 changes: 1 addition & 1 deletion web/book/tests/documentation/book.rs
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ fn collect_book_examples() -> Result<Vec<Example>> {
})
.flatten()
// Add an index suffix to each path's examples (so we group by the path).
.group_by(|e| e.name.clone())
.chunk_by(|e| e.name.clone())
.into_iter()
.flat_map(|(path, blocks)| {
blocks.into_iter().enumerate().map(move |(i, e)| Example {
Expand Down

0 comments on commit 7468139

Please sign in to comment.