Skip to content

Commit 072f69e

Browse files
committed
fixing ts linting and rust test
1 parent bd2160f commit 072f69e

File tree

4 files changed

+30
-28
lines changed

4 files changed

+30
-28
lines changed

crates/project-model/src/workspace.rs

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1317,24 +1317,25 @@ fn sysroot_to_crate_graph(
13171317
.filter_map(|krate| {
13181318
let file_id = load(&sysroot[krate].root)?;
13191319

1320-
let env = Env::default();
1321-
let display_name = CrateDisplayName::from_canonical_name(sysroot[krate].name.clone());
1322-
let crate_id = crate_graph.add_crate_root(
1320+
let env = Env::default();
1321+
let display_name =
1322+
CrateDisplayName::from_canonical_name(sysroot[krate].name.clone());
1323+
let crate_id = crate_graph.add_crate_root(
13231324
file_id,
13241325
Edition::CURRENT,
13251326
Some(display_name),
13261327
None,
1327-
cfg_options.clone(),
1328-
None,
1329-
env,
1330-
false,
1331-
CrateOrigin::Lang(LangCrateOrigin::from(&*sysroot[krate].name)),
1332-
target_layout.clone(),
1333-
channel,
1334-
);
1335-
Some((krate, crate_id))
1336-
})
1337-
.collect(),
1328+
cfg_options.clone(),
1329+
None,
1330+
env,
1331+
false,
1332+
CrateOrigin::Lang(LangCrateOrigin::from(&*sysroot[krate].name)),
1333+
target_layout.clone(),
1334+
channel,
1335+
);
1336+
Some((krate, crate_id))
1337+
})
1338+
.collect(),
13381339
};
13391340
for from in sysroot.crates() {
13401341
for &to in sysroot[from].deps.iter() {

editors/code/src/ctx.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ import { ExecOptions } from "child_process";
3333
export type Workspace =
3434
| { kind: "Empty" }
3535
| {
36-
kind: "Workspace Folder";
37-
}
36+
kind: "Workspace Folder";
37+
}
3838
| {
39-
kind: "Detached Files";
40-
files: vscode.TextDocument[];
41-
};
39+
kind: "Detached Files";
40+
files: vscode.TextDocument[];
41+
};
4242

4343
export function fetchWorkspace(): Workspace {
4444
const folders = (vscode.workspace.workspaceFolders || []).filter(
@@ -52,9 +52,9 @@ export function fetchWorkspace(): Workspace {
5252
? rustDocuments.length === 0
5353
? { kind: "Empty" }
5454
: {
55-
kind: "Detached Files",
56-
files: rustDocuments,
57-
}
55+
kind: "Detached Files",
56+
files: rustDocuments,
57+
}
5858
: { kind: "Workspace Folder" };
5959
}
6060

@@ -476,4 +476,4 @@ export interface Disposable {
476476
dispose(): void;
477477
}
478478

479-
export type Cmd = (...args: any[]) => unknown;
479+
export type Cmd = (...args: any[]) => unknown;

editors/code/src/dependencies_provider.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import * as vscode from "vscode";
22
import * as fspath from "path";
33
import * as fs from "fs";
4-
import {CtxInit} from "./ctx";
4+
import { CtxInit } from "./ctx";
55
import * as ra from "./lsp_ext";
6-
import {FetchDependencyListResult} from "./lsp_ext";
6+
import { FetchDependencyListResult } from "./lsp_ext";
77

88
export class RustDependenciesProvider
9-
implements vscode.TreeDataProvider<Dependency | DependencyFile> {
9+
implements vscode.TreeDataProvider<Dependency | DependencyFile>
10+
{
1011
dependenciesMap: { [id: string]: Dependency | DependencyFile };
1112
ctx: CtxInit;
1213

@@ -131,4 +132,4 @@ export class DependencyFile extends vscode.TreeItem {
131132
}
132133
}
133134

134-
export type DependencyId = { id: string };
135+
export type DependencyId = { id: string };

editors/code/src/toolchain.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,4 +211,4 @@ async function isFileAtUri(uri: vscode.Uri): Promise<boolean> {
211211
} catch {
212212
return false;
213213
}
214-
}
214+
}

0 commit comments

Comments
 (0)