Skip to content

Commit

Permalink
build(rust): Bump some dependencies (#10396)
Browse files Browse the repository at this point in the history
  • Loading branch information
stinodego authored Aug 9, 2023
1 parent 1313e59 commit 1494033
Show file tree
Hide file tree
Showing 12 changed files with 107 additions and 92 deletions.
18 changes: 9 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,31 +24,31 @@ license = "MIT"

[workspace.dependencies]
ahash = "0.8"
atoi = "2.0.0"
bitflags = "1.3"
atoi = "2"
bitflags = "2"
chrono = { version = "0.4", default-features = false, features = ["std"] }
chrono-tz = "0.8"
chrono-tz = "0.8.1"
ciborium = "0.2"
either = "1.8"
futures = "0.3.25"
hashbrown = { version = "0.14.0", features = ["rayon", "ahash"] }
hashbrown = { version = "0.14", features = ["rayon", "ahash"] }
indexmap = { version = "2", features = ["std"] }
memchr = "2"
multiversion = "0.7"
num-traits = "0.2"
object_store = { version = "0.6.0", default-features = false }
object_store = { version = "0.6", default-features = false }
once_cell = "1"
pyo3 = "0.19"
rand = "0.8"
rayon = "1.6"
regex = "1.6"
serde = "1"
regex = "1.7.1"
serde = "1.0.160"
serde_json = "1"
simd-json = { version = "0.10", features = ["allow-non-simd", "known-key"] }
smartstring = "1"
sqlparser = "0.34"
sqlparser = "0.36"
strum_macros = "0.25"
thiserror = "^1"
thiserror = "1"
url = "2.3.1"
version_check = "0.9.4"
xxhash-rust = { version = "0.8.6", features = ["xxh3"] }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use super::*;
use crate::prelude::*;

bitflags! {
#[derive(Default)]
#[derive(Default, Clone)]
struct BitSettings: u8 {
const ORIGINAL = 0x01;
const LEXICAL_ORDERING = 0x02;
Expand Down
19 changes: 13 additions & 6 deletions crates/polars-core/src/chunked_array/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,19 @@ pub struct ChunkedArray<T: PolarsDataType> {
}

bitflags! {
#[derive(Default)]
#[derive(Default, Clone, Copy)]
pub(crate) struct Settings: u8 {
const SORTED_ASC = 0x01;
const SORTED_DSC = 0x02;
const FAST_EXPLODE_LIST = 0x04;
}}
const SORTED_ASC = 0x01;
const SORTED_DSC = 0x02;
const FAST_EXPLODE_LIST = 0x04;
}
}

impl Settings {
pub fn clear(&mut self) {
*self.0.bits_mut() = 0;
}
}

impl<T: PolarsDataType> ChunkedArray<T> {
pub(crate) fn is_sorted_ascending_flag(&self) -> bool {
Expand All @@ -182,7 +189,7 @@ impl<T: PolarsDataType> ChunkedArray<T> {
}

pub(crate) fn clear_settings(&mut self) {
self.bit_settings.bits = 0;
self.bit_settings.clear()
}

pub fn is_sorted_flag(&self) -> IsSorted {
Expand Down
10 changes: 5 additions & 5 deletions crates/polars-io/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ polars-utils = { version = "0.31.1", path = "../polars-utils" }
ahash = { workspace = true }
arrow = { workspace = true }
async-trait = { version = "0.1.59", optional = true }
bytes = { version = "1.3.0" }
bytes = { version = "1.3" }
chrono = { workspace = true, optional = true }
chrono-tz = { version = "0.8.1", optional = true }
fast-float = { version = "0.2.0", optional = true }
chrono-tz = { workspace = true, optional = true }
fast-float = { version = "0.2", optional = true }
flate2 = { version = "1", optional = true, default-features = false }
futures = { workspace = true, optional = true }
home = { version = "0.5.4" }
lexical = { version = "6", optional = true, default-features = false, features = ["std", "parse-integers"] }
lexical-core = { version = "0.8", optional = true }
memchr = { workspace = true }
memmap = { package = "memmap2", version = "0.5.2", optional = true }
memmap = { package = "memmap2", version = "0.7", optional = true }
num-traits = { workspace = true }
object_store = { workspace = true, optional = true }
once_cell = { workspace = true }
Expand All @@ -39,7 +39,7 @@ serde = { workspace = true, features = ["derive"], optional = true }
serde_json = { version = "1", default-features = false, features = ["alloc", "raw_value"], optional = true }
simd-json = { workspace = true, optional = true }
simdutf8 = { version = "0.1", optional = true }
tokio = { version = "1.26.0", features = ["net"], optional = true }
tokio = { version = "1.26", features = ["net"], optional = true }
url = { workspace = true, optional = true }

[dev-dependencies]
Expand Down
1 change: 1 addition & 0 deletions crates/polars-lazy/src/physical_plan/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ pub type GroupsProxyCache = Arc<Mutex<PlHashMap<String, GroupsProxy>>>;

bitflags! {
#[repr(transparent)]
#[derive(Copy, Clone)]
pub(super) struct StateFlags: u8 {
/// More verbose logging
const VERBOSE = 0x01;
Expand Down
2 changes: 1 addition & 1 deletion crates/polars-ops/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ chrono-tz = { workspace = true, optional = true }
either = { workspace = true }
hex = { version = "0.4", optional = true }
indexmap = { workspace = true }
jsonpath_lib = { version = "0.3.0", optional = true, git = "https://github.com/ritchie46/jsonpath", branch = "improve_compiled" }
jsonpath_lib = { version = "0.3", optional = true, git = "https://github.com/ritchie46/jsonpath", branch = "improve_compiled" }
memchr = { workspace = true }
serde = { workspace = true, features = ["derive"], optional = true }
serde_json = { workspace = true, optional = true }
Expand Down
1 change: 1 addition & 0 deletions crates/polars-sql/src/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ impl SQLContext {
let mut parser = Parser::new(&GenericDialect);
parser = parser.with_options(ParserOptions {
trailing_commas: true,
..Default::default()
});

let ast = parser
Expand Down
1 change: 1 addition & 0 deletions crates/polars-sql/src/sql_expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -553,6 +553,7 @@ pub fn sql_expr<S: AsRef<str>>(s: S) -> PolarsResult<Expr> {
let mut parser = Parser::new(&GenericDialect);
parser = parser.with_options(ParserOptions {
trailing_commas: true,
..Default::default()
});

let mut ast = parser.try_with_sql(s.as_ref()).map_err(to_compute_err)?;
Expand Down
2 changes: 1 addition & 1 deletion crates/polars-time/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ chrono = { workspace = true }
chrono-tz = { workspace = true, optional = true }
now = { version = "0.1" }
once_cell = { workspace = true }
regex = { version = "1.7.1" }
regex = { workspace = true }
serde = { workspace = true, features = ["derive"], optional = true }
smartstring = { workspace = true }

Expand Down
6 changes: 3 additions & 3 deletions polars-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ path = "src/main.rs"
polars = { version = "0.31.1", path = "../crates/polars", features = ["lazy", "sql", "dtype-full", "serde-lazy"] }

atty = { version = "0.2" }
ciborium = "0.2.0"
ciborium = { workspace = true }
clap = { version = "4.2.2", features = ["derive", "cargo"] }
nu-ansi-term = { version = "0.49.0", optional = true }
once_cell = { workspace = true }
reedline = { git = "https://github.com/nushell/reedline", rev = "541698fb74c249cd540583fab2425c91700481fa" }
serde = { version = "1.0.160", features = ["derive"] }
reedline = { git = "https://github.com/nushell/reedline", rev = "e7ee24a2b01d041feefb5eb58ba2377a20412f94" }
serde = { workspace = true, features = ["derive"] }
sqlparser = { workspace = true }
tmp_env = "0.1.1"

Expand Down
Loading

0 comments on commit 1494033

Please sign in to comment.