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
2 changes: 1 addition & 1 deletion docs/ci-operations.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CI 운영 안내

CI는 `.node-version`의 Node 22.23.2와 `rust-toolchain.toml`의 Rust 1.93.0을 사용한다. 로컬 커밋 hook과 브랜치 push에는 검사 통과를 강제하지 않는다. `main` 직접 push도 허용한다.
CI는 `.node-version`의 Node 22.23.2와 `rust-toolchain.toml`의 Rust 1.99.1을 사용한다. 로컬 커밋 hook과 브랜치 push에는 검사 통과를 강제하지 않는다. `main` 직접 push도 허용한다.

## PR 검사

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "1.93.0"
channel = "1.99.1"
profile = "minimal"
components = ["clippy", "rustfmt"]
2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "dm-note"
version = "2.1.0"
edition = "2021"
rust-version = "1.88"
rust-version = "1.99"
default-run = "dm-note"

[workspace]
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/crates/element-document/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "element-document"
version = "0.1.0"
edition = "2021"
rust-version = "1.88"
rust-version = "1.99"
publish = false
description = "DmNote 요소 문서 엔진 - 트리 문서, 규칙표 검증, 편집 연산, 버전 옮기기"

Expand Down
9 changes: 5 additions & 4 deletions src-tauri/crates/element-document/src/value.rs
Original file line number Diff line number Diff line change
Expand Up @@ -333,11 +333,12 @@ impl ValueKind {
// 끊긴 참조는 허용한다 - 지운 요소를 가리키는 값(스프라이트 트리거 등)은 옛 계약에서도 정상이고,
// 함께 붙이는 대상이 나중에 도착할 수도 있다. 있는 요소의 종류만 본다
None => {}
Some(kind) => {
if !kinds.is_empty() && !kinds.iter().any(|allowed| allowed == kind) {
out.push(Violation::new(ViolationCode::ReferenceWrongKind, path));
}
Some(kind)
if !kinds.is_empty() && !kinds.iter().any(|allowed| allowed == kind) =>
{
out.push(Violation::new(ViolationCode::ReferenceWrongKind, path));
}
Some(_) => {}
},
},
ValueKind::List {
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/src/state/app_state/audio_runtime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ impl AppState {

pub fn unsubscribe_pointer_input(&self) -> u32 {
self.pointer_input_subscribers
.fetch_update(Ordering::SeqCst, Ordering::SeqCst, |count| {
.try_update(Ordering::SeqCst, Ordering::SeqCst, |count| {
Some(count.saturating_sub(1))
})
.map_or(0, |previous| previous.saturating_sub(1))
Expand Down
Loading