nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-24 07:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

editor/vscode: lint

Browse Source
This commit is contained in:
Vladimir Serov 2020-05-21 18:49:30 +03:00
parent 125e4197d8
commit 8e0d776369
No known key found for this signature in database
GPG Key ID: 6BA7C26C3FDF7BB3
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
editors/code/src/main.ts
View File

@ -196,9 +196,9 @@ async function patchelf(dest: PathLike): Promise<void> {
title: "Patching rust-analysis for NixOS"
},
async (progress, _) => {
let patch_path = path.join(os.tmpdir(), "patch-ra.nix")
progress.report({message: "Writing nix file", increment: 5})
await fs.writeFile(patch_path, `
const patchPath = path.join(os.tmpdir(), "patch-ra.nix");
progress.report({ message: "Writing nix file", increment: 5 });
await fs.writeFile(patchPath, `
{src, pkgs ? import <nixpkgs> {}}:
pkgs.stdenv.mkDerivation {
name = "rust-analyzer";
@ -210,23 +210,23 @@ async function patchelf(dest: PathLike): Promise<void> {
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out
'';
}
`)
let orig_file = dest + "-orig"
await fs.rename(dest, orig_file)
progress.report({message: "Patching executable", increment: 20})
`);
const origFile = dest + "-orig";
await fs.rename(dest, origFile);
progress.report({ message: "Patching executable", increment: 20 });
await new Promise((resolve, reject) => {
exec(`nix-build ${patch_path} --arg src '${orig_file}' -o ${dest}`,
exec(`nix-build ${patchPath} --arg src '${origFile}' -o ${dest}`,
(err, stdout, stderr) => {
if (err != null) {
reject(Error(stderr))
reject(Error(stderr));
} else {
resolve(stdout)
resolve(stdout);
}
})
})
await fs.unlink(orig_file)
});
});
await fs.unlink(origFile);
}
)
);
}
async function getServer(config: Config, state: PersistentState): Promise<string | undefined> {
@ -281,7 +281,7 @@ async function getServer(config: Config, state: PersistentState): Promise<string
// Patching executable if that's NixOS.
if (fs.stat("/etc/nixos").then(_ => true).catch(_ => false)) {
await patchelf(dest)
await patchelf(dest);
}
await state.updateServerVersion(config.package.version);