chore: Prepare for Rust edition bump to 2024 (without autofix) (#27791)
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:
parent
d51aa2ffb0
commit
0729d24d77
162 changed files with 2333 additions and 1937 deletions
|
@ -81,7 +81,9 @@ impl Tool for BashTool {
|
|||
};
|
||||
|
||||
if worktrees.next().is_some() {
|
||||
return Task::ready(Err(anyhow!("'.' is ambiguous in multi-root workspaces. Please specify a root directory explicitly.")));
|
||||
return Task::ready(Err(anyhow!(
|
||||
"'.' is ambiguous in multi-root workspaces. Please specify a root directory explicitly."
|
||||
)));
|
||||
}
|
||||
|
||||
only_worktree.read(cx).abs_path()
|
||||
|
|
|
@ -526,7 +526,8 @@ impl EditToolRequest {
|
|||
}
|
||||
}
|
||||
|
||||
write!(&mut output,
|
||||
write!(
|
||||
&mut output,
|
||||
"The SEARCH section must exactly match an existing block of lines including all white \
|
||||
space, comments, indentation, docstrings, etc."
|
||||
)?;
|
||||
|
@ -545,7 +546,8 @@ impl EditToolRequest {
|
|||
}
|
||||
|
||||
if has_errors {
|
||||
writeln!(&mut output,
|
||||
writeln!(
|
||||
&mut output,
|
||||
"\n\nYou can fix errors by running the tool again. You can include instructions, \
|
||||
but errors are part of the conversation so you don't need to repeat them.",
|
||||
)?;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue