Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/jwst-asan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ jobs:
- name: Setup Rust
uses: ./.github/actions/setup-rust
with:
toolchain: nightly-2023-08-19
toolchain: nightly-2024-10-18

- name: Memory Check
run: |
rustup component add rust-src --toolchain nightly-2023-08-19
cargo +nightly-2023-08-19 test -Zbuild-std --target x86_64-unknown-linux-gnu -p jwst-codec --lib
rustup component add rust-src --toolchain nightly-2024-10-18
cargo +nightly-2024-10-18 test -Zbuild-std --target x86_64-unknown-linux-gnu -p jwst-codec --lib
4 changes: 2 additions & 2 deletions .github/workflows/jwst-memory-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ jobs:
- name: Setup Rust
uses: ./.github/actions/setup-rust
with:
toolchain: nightly-2023-08-19
toolchain: nightly-2024-10-18
components: miri
- name: Install latest nextest release
uses: taiki-e/install-action@nextest

- name: Miri Code Check
run: |
cargo +nightly-2023-08-19 miri nextest run -p jwst-codec -j2
cargo +nightly-2024-10-18 miri nextest run -p jwst-codec -j2
6 changes: 3 additions & 3 deletions .github/workflows/jwst.yml
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ jobs:
CARGO_TERM_COLOR: always

- name: Upload analysis results to GitHub
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: rust-clippy-results.sarif
wait-for-processing: true
Expand Down Expand Up @@ -438,7 +438,7 @@ jobs:
- name: Setup Rust
uses: ./.github/actions/setup-rust
with:
toolchain: nightly-2023-08-19
toolchain: nightly-2024-10-18

- name: fuzzing
working-directory: ./libs/jwst-codec-utils
Expand All @@ -458,7 +458,7 @@ jobs:

- name: upload fuzz artifacts
if: ${{ failure() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: fuzz-artifact
path: ./lib/jwst-codec-utils/fuzz/artifacts/**/*
133 changes: 110 additions & 23 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions apps/keck/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jwst = [
]
api = ["utoipa"]
schema = ["utoipa-swagger-ui"]
sqlite = []

[dependencies]
axum = { version = "0.6.20", features = ["headers", "ws"] }
Expand Down
6 changes: 4 additions & 2 deletions libs/jwst-codec/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ ordered-float = { version = "4.1", features = ["arbitrary"] }

[target.'cfg(loom)'.dependencies]
loom = { version = "0.7", features = ["checkpoint"] }
# override the dev-dependencies feature
async-lock = { version = "3.4.0", features = ["loom"] }

[dev-dependencies]
assert-json-diff = "2.0"
Expand All @@ -57,8 +59,8 @@ lib0 = { version = "0.16", features = ["lib0-serde"] }
ordered-float = { version = "4.1", features = ["proptest"] }
path-ext = "0.1"
proptest = "1.3"
proptest-derive = "0.4"
yrs = "=0.16.5"
proptest-derive = "0.5"
yrs = "=0.22.0"

[lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = [
Expand Down
4 changes: 2 additions & 2 deletions libs/jwst-codec/src/doc/awareness.rs
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ mod tests {
states.insert(0, AwarenessState::new(2, "test0".to_string()));
states.insert(1, AwarenessState::new(2, "test1".to_string()));
awareness.apply_update(states);
assert_eq!(awareness.get_states().contains_key(&1), true);
assert!(awareness.get_states().contains_key(&1));

// local state will not apply
assert_eq!(awareness.get_states().get(&0).unwrap().content, "null".to_string());
Expand Down Expand Up @@ -218,7 +218,7 @@ mod tests {
assert_eq!(event.updated, [1]);

assert_eq!(
event.get_updated(&awareness.get_states()).get(&1).unwrap(),
event.get_updated(awareness.get_states()).get(&1).unwrap(),
&AwarenessState::new(3, "test update".to_string())
);

Expand Down
2 changes: 1 addition & 1 deletion libs/jwst-codec/src/doc/codec/any.rs
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ impl Display for Any {
match self {
Self::True => write!(f, "true"),
Self::False => write!(f, "false"),
Self::String(s) => write!(f, "\"{}\"", s),
Self::String(s) => write!(f, "{}", s),
Self::Integer(i) => write!(f, "{}", i),
Self::Float32(v) => write!(f, "{}", v),
Self::Float64(v) => write!(f, "{}", v),
Expand Down
1 change: 1 addition & 0 deletions libs/jwst-codec/src/doc/codec/io/codec_v1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ impl CrdtWriter for RawEncoder {
}

#[cfg(test)]
#[allow(clippy::approx_constant)]
mod tests {
use super::*;

Expand Down
1 change: 1 addition & 0 deletions libs/jwst-core/src/workspaces/metadata/pages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use std::collections::HashMap;

use jwst_codec::{Any, Array, Map, Value};

#[allow(dead_code)]
pub struct PageMeta {
pub id: String,
pub favorite: Option<bool>,
Expand Down
2 changes: 2 additions & 0 deletions libs/jwst-core/src/workspaces/observe.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ impl Workspace {
}

pub fn subscribe_doc(&self, f: impl Fn(&[u8], &[History]) + Sync + Send + 'static) {
self.doc.publisher.start();
self.doc.subscribe(f)
}

pub fn unsubscribe_all(&self) {
self.doc.unsubscribe_all();
self.doc.publisher.stop();
self.awareness.write().unwrap().on_update(|_, _| {})
}
}
Loading
Loading