Skip to content

Commit 904b584

Browse files
committed
try fixup
1 parent f538307 commit 904b584

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ install-release: venv
1414
source .venv/bin/activate && maturin develop --release
1515

1616
pre-commit: venv
17+
rustup component add rustfmt --toolchain nightly
1718
cargo fmt --all && cargo clippy --all-features
1819
.venv/bin/python -m ruff check polars_xdt tests --fix --exit-non-zero-on-fix
1920
.venv/bin/python -m ruff format polars_xdt tests

src/expressions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ use crate::timezone::*;
66
use crate::to_julian::*;
77
use polars::prelude::*;
88
use pyo3_polars::derive::polars_expr;
9-
use serde::Deserialize;
109
use pyo3_polars::export::polars_core::datatypes::TimeZone as PolarsTimeZone;
10+
use serde::Deserialize;
1111

1212
#[derive(Deserialize)]
1313
pub struct FromLocalDatetimeKwargs {

src/timezone.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
use arity::try_binary_elementwise;
22
use chrono::{LocalResult, NaiveDateTime, TimeZone};
3-
use pyo3_polars::export::polars_core::datatypes::time_zone::parse_time_zone;
43
use polars::prelude::*;
54
use polars_arrow::legacy::time_zone::Tz;
5+
use pyo3_polars::export::polars_core::datatypes::time_zone::parse_time_zone;
6+
use pyo3_polars::export::polars_core::datatypes::TimeZone as PolarsTimeZone;
67
use pyo3_polars::export::polars_core::utils::arrow::legacy::kernels::Ambiguous;
78
use pyo3_polars::export::polars_core::utils::arrow::temporal_conversions::{
89
timestamp_ms_to_datetime, timestamp_ns_to_datetime, timestamp_us_to_datetime,
910
};
1011
use std::str::FromStr;
11-
use pyo3_polars::export::polars_core::datatypes::TimeZone as PolarsTimeZone;
1212

1313
fn naive_utc_to_naive_local_in_new_time_zone(
1414
from_tz: &Tz,
@@ -126,9 +126,7 @@ pub fn elementwise_from_local_datetime(
126126
))
127127
})
128128
}
129-
_ => {
130-
Ok(datetime.apply(|_| None))
131-
}
129+
_ => Ok(datetime.apply(|_| None)),
132130
},
133131
_ => try_binary_elementwise(datetime, from_tz, |timestamp_opt, from_tz_opt| {
134132
match (timestamp_opt, from_tz_opt) {
@@ -143,6 +141,9 @@ pub fn elementwise_from_local_datetime(
143141
}
144142
}),
145143
};
146-
let out = out?.into_datetime(datetime.time_unit(), PolarsTimeZone::opt_try_new(Some(out_tz))?);
144+
let out = out?.into_datetime(
145+
datetime.time_unit(),
146+
PolarsTimeZone::opt_try_new(Some(out_tz))?,
147+
);
147148
Ok(out)
148149
}

0 commit comments

Comments
 (0)