Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Prepare for Rust edition bump to 2024 (without autofix) (#27791)

Browse source 
Successor to #27779 - in this PR I've applied changes manually, without
futzing with if let lifetimes at all.

Release Notes:

- N/A
This commit is contained in:
Piotr Osiewicz 2025-03-31 20:10:36 +02:00 • committed by GitHub
parent d51aa2ffb0
commit 0729d24d77
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
162 changed files with 2333 additions and 1937 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/semantic_index/src/embedding_index.rs
View file

@ -56,7 +56,10 @@ impl EmbeddingIndex {
&self.db
}
pub fn index_entries_changed_on_disk(&self, cx: &App) -> impl Future<Output = Result<()>> {
pub fn index_entries_changed_on_disk(
&self,
cx: &App,
) -> impl Future<Output = Result<()>> + use<> {
if !cx.is_staff() {
return async move { Ok(()) }.boxed();
}
@ -78,7 +81,7 @@ impl EmbeddingIndex {
&self,
updated_entries: UpdatedEntriesSet,
cx: &App,
) -> impl Future<Output = Result<()>> {
) -> impl Future<Output = Result<()>> + use<> {
if !cx.is_staff() {
return async move { Ok(()) }.boxed();
}

12
crates/semantic_index/src/summary_index.rs
View file

@ -130,7 +130,7 @@ impl SummaryIndex {
&self,
is_auto_available: bool,
cx: &App,
) -> impl Future<Output = Result<()>> {
) -> impl Future<Output = Result<()>> + use<> {
let start = Instant::now();
let backlogged;
let digest;
@ -193,7 +193,7 @@ impl SummaryIndex {
updated_entries: UpdatedEntriesSet,
is_auto_available: bool,
cx: &App,
) -> impl Future<Output = Result<()>> {
) -> impl Future<Output = Result<()>> + use<> {
let start = Instant::now();
let backlogged;
let digest;
@ -528,7 +528,11 @@ impl SummaryIndex {
}
}
fn summarize_code(code: &str, path: &Path, cx: &App) -> impl Future<Output = Result<String>> {
fn summarize_code(
code: &str,
path: &Path,
cx: &App,
) -> impl Future<Output = Result<String>> + use<> {
let start = Instant::now();
let (summary_model_id, use_cache): (LanguageModelId, bool) = (
"Qwen/Qwen2-7B-Instruct".to_string().into(), // TODO read this from the user's settings.
@ -639,7 +643,7 @@ impl SummaryIndex {
&self,
worktree_abs_path: Arc<Path>,
cx: &App,
) -> impl Future<Output = Result<()>> {
) -> impl Future<Output = Result<()>> + use<> {
let start = Instant::now();
let backlogged = {
let (tx, rx) = channel::bounded(512);