nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-06 20:28:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #7984

Browse Source 
7984: Improve version display r=matklad a=lnicola

Maybe closes #7854

The version string for unreleased builds looks like this now:

```
$ rust-analyzer --version
rust-analyzer 2021-03-08-159-gc0459c535
```

Release builds should only have the tag name (`2021-03-15`).

Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
This commit is contained in:
bors[bot] 2021-03-13 13:22:25 +00:00 committed by GitHub
commit ceffcf8a11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/rust-analyzer/build.rs
View File

@ -39,8 +39,7 @@ fn set_rerun() {
} }
fn rev() -> Option<String> { fn rev() -> Option<String> {
let output = Command::new("git").args(&["rev-parse", "HEAD"]).output().ok()?; let output = Command::new("git").args(&["describe", "--tags"]).output().ok()?;
let stdout = String::from_utf8(output.stdout).ok()?; let stdout = String::from_utf8(output.stdout).ok()?;
let short_hash = stdout.get(0..7)?; Some(stdout)
Some(short_hash.to_owned())
} }

5
editors/code/src/commands.ts
View File

@ -253,11 +253,10 @@ export function ssr(ctx: Ctx): Cmd {
export function serverVersion(ctx: Ctx): Cmd { export function serverVersion(ctx: Ctx): Cmd {
return async () => { return async () => {
const { stdout } = spawnSync(ctx.serverPath, ["--version"], { encoding: "utf8" }); const { stdout } = spawnSync(ctx.serverPath, ["--version"], { encoding: "utf8" });
const commitHash = stdout.slice(`rust-analyzer `.length).trim(); const versionString = stdout.slice(`rust-analyzer `.length).trim();
const { releaseTag } = ctx.config.package;
void vscode.window.showInformationMessage( void vscode.window.showInformationMessage(
`rust-analyzer version: ${releaseTag ?? "unreleased"} (${commitHash})` `rust-analyzer version: ${versionString}`
); );
}; };
} }