From: king6cong Date: Mon, 20 Feb 2017 11:30:15 +0000 (+0800) Subject: make code more readable X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~9^2~136^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a383ea041206a35848a475566f86e755de32a071;p=cargo.git make code more readable --- diff --git a/src/cargo/ops/cargo_rustc/custom_build.rs b/src/cargo/ops/cargo_rustc/custom_build.rs index ea3e0f98c..fe6b1e605 100644 --- a/src/cargo/ops/cargo_rustc/custom_build.rs +++ b/src/cargo/ops/cargo_rustc/custom_build.rs @@ -352,10 +352,10 @@ impl BuildOutput { match key { "rustc-flags" => { - let (libs, links) = + let (paths, links) = BuildOutput::parse_rustc_flags(value, &whence)?; library_links.extend(links.into_iter()); - library_paths.extend(libs.into_iter()); + library_paths.extend(paths.into_iter()); } "rustc-link-lib" => library_links.push(value.to_string()), "rustc-link-search" => library_paths.push(PathBuf::from(value)), @@ -381,7 +381,7 @@ impl BuildOutput { let value = value.trim(); let mut flags_iter = value.split(|c: char| c.is_whitespace()) .filter(|w| w.chars().any(|c| !c.is_whitespace())); - let (mut library_links, mut library_paths) = (Vec::new(), Vec::new()); + let (mut library_paths, mut library_links) = (Vec::new(), Vec::new()); loop { let flag = match flags_iter.next() { Some(f) => f,