diff --git a/.github/workflows/release-vscode.yml b/.github/workflows/release-vscode.yml index a06e3d5c..b6ad6629 100644 --- a/.github/workflows/release-vscode.yml +++ b/.github/workflows/release-vscode.yml @@ -85,7 +85,7 @@ jobs: node-version: 22 - name: Check Rust Version run: yarn check-msrv - - uses: dtolnay/rust-toolchain@1.82.0 # check-min-version + - uses: dtolnay/rust-toolchain@1.83.0 # check-min-version - uses: Swatinem/rust-cache@v2 - run: cargo check --workspace diff --git a/Cargo.toml b/Cargo.toml index 7b17f973..a342a010 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ license = "Apache-2.0" homepage = "https://github.com/Myriad-Dreamin/tinymist" repository = "https://github.com/Myriad-Dreamin/tinymist" # also change in ci.yml -rust-version = "1.82" +rust-version = "1.83" [workspace] resolver = "2" diff --git a/crates/tinymist-query/src/analysis/completion/scope.rs b/crates/tinymist-query/src/analysis/completion/scope.rs index a1785af0..d249eb6e 100644 --- a/crates/tinymist-query/src/analysis/completion/scope.rs +++ b/crates/tinymist-query/src/analysis/completion/scope.rs @@ -166,7 +166,7 @@ impl CompletionPair<'_, '_, '_> { let docs = default_docs.get(&name).cloned(); - let label_detail = ty.describe().map(From::from).or_else(|| Some("any".into())); + let label_detail = ty.describe().or_else(|| Some("any".into())); crate::log_debug_ct!("scope completions!: {name} {ty:?} {label_detail:?}"); let detail = docs.or_else(|| label_detail.clone()); diff --git a/crates/tinymist-query/src/analysis/completion/snippet.rs b/crates/tinymist-query/src/analysis/completion/snippet.rs index bcd19939..6f12627c 100644 --- a/crates/tinymist-query/src/analysis/completion/snippet.rs +++ b/crates/tinymist-query/src/analysis/completion/snippet.rs @@ -228,7 +228,7 @@ impl CompletionPair<'_, '_, '_> { continue; } - let label_details = ty.describe().map(From::from).or_else(|| Some("any".into())); + let label_details = ty.describe().or_else(|| Some("any".into())); let base = Completion { kind: CompletionKind::Func, label_details, diff --git a/crates/typst-preview/src/debug_loc.rs b/crates/typst-preview/src/debug_loc.rs index d7765703..42c7314d 100644 --- a/crates/typst-preview/src/debug_loc.rs +++ b/crates/typst-preview/src/debug_loc.rs @@ -24,7 +24,7 @@ impl InternId { } fn to_u64(&self) -> u64 { - (self.lifetime as u64) << 32 | self.id as u64 + ((self.lifetime as u64) << 32) | self.id as u64 } fn from_u64(id: u64) -> Self { diff --git a/crates/typst-preview/src/outline.rs b/crates/typst-preview/src/outline.rs index 1d4fb2c4..02449647 100644 --- a/crates/typst-preview/src/outline.rs +++ b/crates/typst-preview/src/outline.rs @@ -69,7 +69,7 @@ pub(crate) fn get_outline(introspector: &Introspector) -> Option Option