This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1845

rust: move import of PathBuf
ClosedPublic

Authored by indygreg on Jan 10 2018, 10:42 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG11c86ab69e67: rust: move import of PathBuf
Summary

By moving it to the single function that uses it, we eliminate a
#cfg.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Jan 10 2018, 10:42 PM
yuja accepted this revision.Jan 11 2018, 8:10 AM
This revision is now accepted and ready to land.Jan 11 2018, 8:10 AM
Closed by commit rHG11c86ab69e67: rust: move import of PathBuf (authored by indygreg). · Explain WhyJan 11 2018, 8:40 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/hgcli/build.rs (5 lines)

Diff 4796

rust/hgcli/build.rs

// build.rs -- Configure build environment for `hgcli` Rust package. // build.rs -- Configure build environment for `hgcli` Rust package.
// //
// Copyright 2017 Gregory Szorc <gregory.szorc@gmail.com> // Copyright 2017 Gregory Szorc <gregory.szorc@gmail.com>
// //
// This software may be used and distributed according to the terms of the // This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version. // GNU General Public License version 2 or any later version.
use std::collections::HashMap; use std::collections::HashMap;
use std::env; use std::env;
use std::path::Path; use std::path::Path;
#[cfg(target_os = "windows")]
use std::path::PathBuf;
use std::process::Command; use std::process::Command;
struct PythonConfig { struct PythonConfig {
python: String, python: String,
config: HashMap<String, String>, config: HashMap<String, String>,
} }
fn get_python_config() -> PythonConfig { fn get_python_config() -> PythonConfig {
match config.config.get("Py_ENABLE_SHARED") { match config.config.get("Py_ENABLE_SHARED") {
Some(value) => value == "1", Some(value) => value == "1",
None => false, None => false,
} }
} }
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
fn have_shared(config: &PythonConfig) -> bool { fn have_shared(config: &PythonConfig) -> bool {
use std::path::PathBuf;
// python27.dll should exist next to python2.7.exe. // python27.dll should exist next to python2.7.exe.
let mut dll = PathBuf::from(&config.python); let mut dll = PathBuf::from(&config.python);
dll.pop(); dll.pop();
dll.push("python27.dll"); dll.push("python27.dll");
return dll.exists(); return dll.exists();
} }