Skip to content

Commit

Permalink
Merge pull request #2091 from jqnatividad/polars-no-smartstring
Browse files Browse the repository at this point in the history
bump polars to latest upstream, removing smartstring dependency
  • Loading branch information
jqnatividad authored Aug 29, 2024
2 parents 4456ee1 + 41880f3 commit 572b4a0
Show file tree
Hide file tree
Showing 6 changed files with 101 additions and 68 deletions.
61 changes: 21 additions & 40 deletions Cargo.lock

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

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ polars = { version = "0.42", features = [
"streaming",
"timezones",
], optional = true }
polars-utils = { version = "0.42.0", default-features = false, optional = true}
pyo3 = { version = "0.22", features = [
"auto-initialize",
"gil-refs",
Expand Down Expand Up @@ -214,7 +215,6 @@ serde_json = { version = "1", features = ["preserve_order"] }
serde_stacker = { version = "0.1", optional = true }
serde_urlencoded = { version = "0.7", optional = true }
simple-expand-tilde = { version = "0.4.0", optional = true }
smartstring = { version = "1", optional = true }
snap = "1"
strsim = { version = "0.11", optional = true }
strum = { version = "0.26", features = ["phf"] }
Expand Down Expand Up @@ -285,10 +285,10 @@ local-encoding = { git = "https://github.com/slonopotamus/local-encoding-rs", br
# BUILD NOTE: Be sure to set QSV_POLARS_REV below to the latest commit short hash or tag
# of polars/py-polars before building qsv. This allows us to show the polars rev/tag in --version.
# if we are using a release version of Rust Polars, leave QSV_POLARS_REV empty
# QSV_POLARS_REV=py-1.6.0
polars = { git = "https://github.com/pola-rs/polars", tag = "py-1.6.0" }
# polars = { git = "https://github.com/pola-rs/polars", rev = "f0ba999" }

# QSV_POLARS_REV=915f164
# polars = { git = "https://github.com/pola-rs/polars", tag = "py-1.6.0" }
polars = { git = "https://github.com/pola-rs/polars", rev = "915f164" }
polars-utils = { git = "https://github.com/pola-rs/polars", rev = "915f164" }

[features]
default = ["mimalloc"]
Expand Down Expand Up @@ -345,7 +345,7 @@ python = ["pyo3"]
to = ["csvs_convert"]
lite = []
datapusher_plus = ["self_update"]
polars = ["dep:polars", "smartstring"]
polars = ["dep:polars", "polars-utils"]
feature_capable = []
nightly = [
"rand/nightly",
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/count.rs
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ pub fn polars_count_input(
let mut comment_char = String::new();
let comment_prefix = if let Some(c) = conf.comment {
comment_char.push(c as char);
Some(comment_char.as_str())
Some(PlSmallStr::from_str(comment_char.as_str()))
} else {
None
};
Expand Down
Loading

0 comments on commit 572b4a0

Please sign in to comment.