Skip to content

Commit ef638e8

Browse files
authored
Merge pull request #157 from piwicode/master
Fix spelling.
2 parents 576f550 + 210efe7 commit ef638e8

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

src/lib.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,12 @@ pub enum Error {
129129
/// Contains the command and the cause.
130130
Command { command: String, cause: io::Error },
131131

132-
/// `pkg-config` did not exit sucessfully after probing a library.
132+
/// `pkg-config` did not exit successfully after probing a library.
133133
///
134134
/// Contains the command and output.
135135
Failure { command: String, output: Output },
136136

137-
/// `pkg-config` did not exit sucessfully on the first attempt to probe a library.
137+
/// `pkg-config` did not exit successfully on the first attempt to probe a library.
138138
///
139139
/// Contains the command and output.
140140
ProbeFailure {
@@ -423,15 +423,15 @@ impl Config {
423423

424424
// pkg-config may not be aware of cross-compilation, and require
425425
// a wrapper script that sets up platform-specific prefixes.
426-
match self.targetted_env_var("PKG_CONFIG_ALLOW_CROSS") {
426+
match self.targeted_env_var("PKG_CONFIG_ALLOW_CROSS") {
427427
// don't use pkg-config if explicitly disabled
428428
Some(ref val) if val == "0" => false,
429429
Some(_) => true,
430430
None => {
431431
// if not disabled, and pkg-config is customized,
432432
// then assume it's prepared for cross-compilation
433-
self.targetted_env_var("PKG_CONFIG").is_some()
434-
|| self.targetted_env_var("PKG_CONFIG_SYSROOT_DIR").is_some()
433+
self.targeted_env_var("PKG_CONFIG").is_some()
434+
|| self.targeted_env_var("PKG_CONFIG_SYSROOT_DIR").is_some()
435435
}
436436
}
437437
}
@@ -442,7 +442,7 @@ impl Config {
442442
get_variable(package, variable).map_err(|e| e.to_string())
443443
}
444444

445-
fn targetted_env_var(&self, var_base: &str) -> Option<OsString> {
445+
fn targeted_env_var(&self, var_base: &str) -> Option<OsString> {
446446
match (env::var("TARGET"), env::var("HOST")) {
447447
(Ok(target), Ok(host)) => {
448448
let kind = if host == target { "HOST" } else { "TARGET" };
@@ -477,7 +477,7 @@ impl Config {
477477
}
478478

479479
fn run(&self, name: &str, args: &[&str]) -> Result<Vec<u8>, Error> {
480-
let pkg_config_exe = self.targetted_env_var("PKG_CONFIG");
480+
let pkg_config_exe = self.targeted_env_var("PKG_CONFIG");
481481
let fallback_exe = if pkg_config_exe.is_none() {
482482
Some(OsString::from("pkgconf"))
483483
} else {
@@ -518,13 +518,13 @@ impl Config {
518518
}
519519
cmd.args(args).args(&self.extra_args);
520520

521-
if let Some(value) = self.targetted_env_var("PKG_CONFIG_PATH") {
521+
if let Some(value) = self.targeted_env_var("PKG_CONFIG_PATH") {
522522
cmd.env("PKG_CONFIG_PATH", value);
523523
}
524-
if let Some(value) = self.targetted_env_var("PKG_CONFIG_LIBDIR") {
524+
if let Some(value) = self.targeted_env_var("PKG_CONFIG_LIBDIR") {
525525
cmd.env("PKG_CONFIG_LIBDIR", value);
526526
}
527-
if let Some(value) = self.targetted_env_var("PKG_CONFIG_SYSROOT_DIR") {
527+
if let Some(value) = self.targeted_env_var("PKG_CONFIG_SYSROOT_DIR") {
528528
cmd.env("PKG_CONFIG_SYSROOT_DIR", value);
529529
}
530530
if self.print_system_libs {
@@ -577,7 +577,7 @@ impl Config {
577577
}
578578
}
579579

580-
// Implement Default manualy since Bound does not implement Default.
580+
// Implement Default manually since Bound does not implement Default.
581581
impl Default for Config {
582582
fn default() -> Config {
583583
Config {

0 commit comments

Comments
 (0)