Llewellyn/zoxide
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/zoxide.git synced 2024-11-26 06:27:36 +00:00
Code Issues Projects Releases Wiki Activity

Use env! macro instead of env::var (#285)

Browse Source
This commit is contained in:
EdJoPaTo 2021-10-17 12:11:19 +02:00 committed by GitHub
parent f578ec2041
commit 65f91d3837
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build.rs
View File

@ -2,7 +2,7 @@ use std::process::Command;
use std::{env, io}; use std::{env, io};
fn main() { fn main() {
let pkg_version = env::var("CARGO_PKG_VERSION").unwrap(); let pkg_version = env!("CARGO_PKG_VERSION");
let version = match env::var_os("PROFILE") { let version = match env::var_os("PROFILE") {
Some(profile) if profile == "release" => format!("v{}", pkg_version), Some(profile) if profile == "release" => format!("v{}", pkg_version),
_ => git_version().unwrap_or_else(|| format!("v{}-unknown", pkg_version)), _ => git_version().unwrap_or_else(|| format!("v{}-unknown", pkg_version)),
@ -11,6 +11,7 @@ fn main() {
// Since we are generating completions in the package directory, we need to set this so that // Since we are generating completions in the package directory, we need to set this so that
// Cargo doesn't rebuild every time. // Cargo doesn't rebuild every time.
println!("cargo:rerun-if-changed=build.rs");
println!("cargo:rerun-if-changed=src"); println!("cargo:rerun-if-changed=src");
println!("cargo:rerun-if-changed=templates"); println!("cargo:rerun-if-changed=templates");
println!("cargo:rerun-if-changed=tests"); println!("cargo:rerun-if-changed=tests");
@ -19,7 +20,7 @@ fn main() {
} }
fn git_version() -> Option<String> { fn git_version() -> Option<String> {
let dir = env::var("CARGO_MANIFEST_DIR").ok()?; let dir = env!("CARGO_MANIFEST_DIR");
let mut git = Command::new("git"); let mut git = Command::new("git");
git.args(&["-C", &dir, "describe", "--tags", "--broken"]); git.args(&["-C", &dir, "describe", "--tags", "--broken"]);
@ -40,7 +41,7 @@ fn generate_completions() -> io::Result<()> {
use clap_generate::generators::{Bash, Elvish, Fish, PowerShell, Zsh}; use clap_generate::generators::{Bash, Elvish, Fish, PowerShell, Zsh};
let app = &mut App::into_app(); let app = &mut App::into_app();
let bin_name = &env::var("CARGO_PKG_NAME").unwrap(); let bin_name = env!("CARGO_PKG_NAME");
let out_dir = "contrib/completions"; let out_dir = "contrib/completions";
generate_to::<Bash, _, _>(app, bin_name, out_dir)?; generate_to::<Bash, _, _>(app, bin_name, out_dir)?;