Skip to content

Commit 6fb8384

Browse files
committed
Fix deprecated windows build
Signed-off-by: Andrew Stein <steinlink@gmail.com>
1 parent 9882278 commit 6fb8384

5 files changed

Lines changed: 9 additions & 15 deletions

File tree

Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/viewer-charts/test/ts/xy_symbols.spec.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,7 @@
1010
// ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
1111
// ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
1212

13-
import {
14-
PageView as PspViewer,
15-
compareNodes,
16-
expect,
17-
test,
18-
} from "@perspective-dev/test";
19-
import { SymbolPair } from "@perspective-dev/test/src/js/models/column_settings";
13+
import { PageView as PspViewer, expect, test } from "@perspective-dev/test";
2014
import { Page } from "@playwright/test";
2115

2216
const symbols = [

rust/perspective-client/src/rust/config/aggregates.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ impl From<Aggregate> for view_config::AggList {
5252
fn from(value: Aggregate) -> Self {
5353
view_config::AggList {
5454
aggregations: match value {
55-
Aggregate::SingleAggregate(x) => vec![format!("{}", x)],
55+
Aggregate::SingleAggregate(x) => vec![x],
5656
Aggregate::MultiAggregate(x, y) => {
57-
vec![format!("{}", x), format!("{}", y.join(","))]
57+
vec![x, y.join(",")]
5858
},
5959
},
6060
}

rust/perspective-python/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ protobuf-src = ["perspective-client/protobuf-src"]
5151
crate-type = ["cdylib"]
5252

5353
[build-dependencies]
54-
cmake = "0.1.50"
54+
cmake = "0.1.58"
5555
num_cpus = "^1.16.0"
5656
pyo3-build-config = "0.25.1"
5757
python-config-rs = "0.1.2"

rust/perspective-server/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ python = []
3939
disable-cpp = []
4040

4141
[build-dependencies]
42-
cmake = "0.1.50"
42+
cmake = "0.1.58"
4343
num_cpus = "^1.15.0"
4444
shlex = "1.3.0"
4545
protobuf-src = { version = "2.1.1" }

0 commit comments

Comments
 (0)