Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace some PathBuf with Path avoid unnecessary heap allocation (#10929)

Browse source
This commit is contained in:
Integral 2024-12-22 02:34:27 +08:00 committed by GitHub
parent 381b38af0a
commit b19a467ea6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
build.rs
View file

@ -222,7 +222,7 @@ fn has_small_stack(_: &Target) -> Result<bool, Box<dyn Error>> {
} }
fn setup_paths() { fn setup_paths() {
fn get_path(name: &str, default: &str, onvar: PathBuf) -> PathBuf { fn get_path(name: &str, default: &str, onvar: &Path) -> PathBuf {
let mut var = PathBuf::from(env::var(name).unwrap_or(default.to_string())); let mut var = PathBuf::from(env::var(name).unwrap_or(default.to_string()));
if var.is_relative() { if var.is_relative() {
var = onvar.join(var); var = onvar.join(var);
@ -245,7 +245,7 @@ fn setup_paths() {
rsconf::rebuild_if_env_changed("PREFIX"); rsconf::rebuild_if_env_changed("PREFIX");
rsconf::set_env_value("PREFIX", prefix.to_str().unwrap()); rsconf::set_env_value("PREFIX", prefix.to_str().unwrap());
let datadir = get_path("DATADIR", "share/", prefix.clone()); let datadir = get_path("DATADIR", "share/", &prefix);
rsconf::set_env_value("DATADIR", datadir.to_str().unwrap()); rsconf::set_env_value("DATADIR", datadir.to_str().unwrap());
rsconf::rebuild_if_env_changed("DATADIR"); rsconf::rebuild_if_env_changed("DATADIR");
@ -256,7 +256,7 @@ fn setup_paths() {
}; };
rsconf::set_env_value("DATADIR_SUBDIR", datadir_subdir); rsconf::set_env_value("DATADIR_SUBDIR", datadir_subdir);
let bindir = get_path("BINDIR", "bin/", prefix.clone()); let bindir = get_path("BINDIR", "bin/", &prefix);
rsconf::set_env_value("BINDIR", bindir.to_str().unwrap()); rsconf::set_env_value("BINDIR", bindir.to_str().unwrap());
rsconf::rebuild_if_env_changed("BINDIR"); rsconf::rebuild_if_env_changed("BINDIR");
@ -265,16 +265,16 @@ fn setup_paths() {
// If we get our prefix from $HOME, we should use the system's /etc/ // If we get our prefix from $HOME, we should use the system's /etc/
// ~/.local/share/etc/ makes no sense // ~/.local/share/etc/ makes no sense
if prefix_from_home { "/etc/" } else { "etc/" }, if prefix_from_home { "/etc/" } else { "etc/" },
datadir.clone(), &datadir,
); );
rsconf::set_env_value("SYSCONFDIR", sysconfdir.to_str().unwrap()); rsconf::set_env_value("SYSCONFDIR", sysconfdir.to_str().unwrap());
rsconf::rebuild_if_env_changed("SYSCONFDIR"); rsconf::rebuild_if_env_changed("SYSCONFDIR");
let localedir = get_path("LOCALEDIR", "locale/", datadir.clone()); let localedir = get_path("LOCALEDIR", "locale/", &datadir);
rsconf::set_env_value("LOCALEDIR", localedir.to_str().unwrap()); rsconf::set_env_value("LOCALEDIR", localedir.to_str().unwrap());
rsconf::rebuild_if_env_changed("LOCALEDIR"); rsconf::rebuild_if_env_changed("LOCALEDIR");
let docdir = get_path("DOCDIR", "doc/fish", datadir.clone()); let docdir = get_path("DOCDIR", "doc/fish", &datadir);
rsconf::set_env_value("DOCDIR", docdir.to_str().unwrap()); rsconf::set_env_value("DOCDIR", docdir.to_str().unwrap());
rsconf::rebuild_if_env_changed("DOCDIR"); rsconf::rebuild_if_env_changed("DOCDIR");
} }
@ -287,7 +287,7 @@ fn get_version(src_dir: &Path) -> String {
return var; return var;
} }
let path = PathBuf::from(src_dir).join("version"); let path = src_dir.join("version");
if let Ok(strver) = read_to_string(path) { if let Ok(strver) = read_to_string(path) {
return strver.to_string(); return strver.to_string();
} }
@ -316,7 +316,7 @@ fn get_version(src_dir: &Path) -> String {
// or because it refused (safe.directory applies to `git describe`!) // or because it refused (safe.directory applies to `git describe`!)
// So we read the SHA ourselves. // So we read the SHA ourselves.
fn get_git_hash() -> Result<String, Box<dyn std::error::Error>> { fn get_git_hash() -> Result<String, Box<dyn std::error::Error>> {
let gitdir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join(".git"); let gitdir = Path::new(env!("CARGO_MANIFEST_DIR")).join(".git");
// .git/HEAD contains ref: refs/heads/branch // .git/HEAD contains ref: refs/heads/branch
let headpath = gitdir.join("HEAD"); let headpath = gitdir.join("HEAD");

6
src/bin/fish.rs
View file

@ -284,7 +284,7 @@ fn determine_config_directory_paths(argv0: impl AsRef<Path>) -> ConfigPaths {
// Detect if we're running right out of the CMAKE build directory // Detect if we're running right out of the CMAKE build directory
if exec_path.starts_with(env!("CARGO_MANIFEST_DIR")) { if exec_path.starts_with(env!("CARGO_MANIFEST_DIR")) {
let manifest_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")); let manifest_dir = Path::new(env!("CARGO_MANIFEST_DIR"));
FLOG!( FLOG!(
config, config,
"Running out of target directory, using paths relative to CARGO_MANIFEST_DIR:\n", "Running out of target directory, using paths relative to CARGO_MANIFEST_DIR:\n",
@ -346,7 +346,7 @@ fn determine_config_directory_paths(argv0: impl AsRef<Path>) -> ConfigPaths {
PathBuf::from(home).join(DATA_DIR).join(DATA_DIR_SUBDIR) PathBuf::from(home).join(DATA_DIR).join(DATA_DIR_SUBDIR)
} else { } else {
PathBuf::from(DATA_DIR).join(DATA_DIR_SUBDIR) Path::new(DATA_DIR).join(DATA_DIR_SUBDIR)
}; };
let bin = if cfg!(feature = "installable") { let bin = if cfg!(feature = "installable") {
exec_path.parent().map(|x| x.to_path_buf()) exec_path.parent().map(|x| x.to_path_buf())
@ -357,7 +357,7 @@ fn determine_config_directory_paths(argv0: impl AsRef<Path>) -> ConfigPaths {
FLOG!(config, "Using compiled in paths:"); FLOG!(config, "Using compiled in paths:");
paths = ConfigPaths { paths = ConfigPaths {
data, data,
sysconf: PathBuf::from(SYSCONF_DIR).join("fish"), sysconf: Path::new(SYSCONF_DIR).join("fish"),
doc: DOC_DIR.into(), doc: DOC_DIR.into(),
bin, bin,
} }