Merge pull request #4 from rfc1437/codex/run-full-test-suite-after-fixing-internet
Fix workspace test build on latest Rust
This commit is contained in:
@@ -915,7 +915,7 @@ fn terminate_child(child: &mut std::process::Child) {
|
||||
let _ = child.kill();
|
||||
}
|
||||
|
||||
fn prepend_tool_paths(command: &mut Command) {
|
||||
fn prepend_tool_paths(_command: &mut Command) {
|
||||
#[cfg(target_os = "macos")]
|
||||
{
|
||||
let mut paths = vec![
|
||||
|
||||
@@ -203,8 +203,9 @@ fn index_project(
|
||||
current: &mut usize,
|
||||
on_item: Option<&ItemProgressFn>,
|
||||
) -> EngineResult<ReindexReport> {
|
||||
let main_language = data_path
|
||||
.and_then(|path| crate::engine::meta::read_project_json(Path::new(path)).ok())
|
||||
let data_dir = data_path.map(Path::new);
|
||||
let main_language = data_dir
|
||||
.and_then(|path| crate::engine::meta::read_project_json(path).ok())
|
||||
.and_then(|metadata| metadata.main_language)
|
||||
.unwrap_or_else(|| "en".to_string());
|
||||
let mut report = ReindexReport {
|
||||
|
||||
Reference in New Issue
Block a user