commit 184f69ccbc148121ff1ceff70f5e66e7fa3905af
author Haibo Huang <hhb@google.com> Fri Nov 20 02:48:37 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 20 02:48:37 2020 +0000
tree bf0a82fc25167b32feb495c85288e1532e4bd6aa
parent ee3c9de60b1675294654d1d6723a9197eef51e3c
parent 144f2e0a0c5db62321685ec9e654ae5a11d9c800

Upgrade rust/crates/clang-sys to 1.0.3 am: 430b0554f8 am: 64fc21b911 am: ef10236592 am: 144f2e0a0c

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/clang-sys/+/1505791

Change-Id: I148c73f71d0ab4e663fb97a1710b891d122da5cb

.cargo_vcs_info.json

diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index a6a7b1b..f643705 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
 {
   "git": {
-    "sha1": "a5f2b5fef678dd436d16750922f59b2146c9b055"
+    "sha1": "b11a95758757bc1163cd06a32c94709d2cbae92d"
   }
 }

CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a114fb6..8b67c3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [1.0.3] - 2020-11-19
+
+### Fixed
+- Fixed `Clang::find` panicking when `llvm-config` or `xcode-build` don't output anything to `stdout`
+
 ## [1.0.2] - 2020-11-17
 
 ### Fixed

Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index 895d93f..3f1b777 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@
 
 [package]
 name = "clang-sys"
-version = "1.0.2"
+version = "1.0.3"
 authors = ["Kyle Mayes <kyle@mayeses.com>"]
 build = "build.rs"
 links = "clang"

Cargo.toml.orig

diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 2986183..a6dcb14 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -3,7 +3,7 @@
 name = "clang-sys"
 authors = ["Kyle Mayes <kyle@mayeses.com>"]
 
-version = "1.0.2"
+version = "1.0.3"
 
 readme = "README.md"
 license = "Apache-2.0"

METADATA

diff --git a/METADATA b/METADATA
index ad5f1e4..8e336ed 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/clang-sys/clang-sys-1.0.2.crate"
+    value: "https://static.crates.io/crates/clang-sys/clang-sys-1.0.3.crate"
   }
-  version: "1.0.2"
+  version: "1.0.3"
   license_type: NOTICE
   last_upgrade_date {
     year: 2020
     month: 11
-    day: 17
+    day: 19
   }
 }

src/support.rs

diff --git a/src/support.rs b/src/support.rs
index 2441487..8422f59 100644
--- a/src/support.rs
+++ b/src/support.rs
@@ -84,11 +84,15 @@
             paths.push(path.into());
         }
         if let Ok(path) = run_llvm_config(&["--bindir"]) {
-            paths.push(path.lines().next().unwrap().into());
+            if let Some(line) = path.lines().next() {
+                paths.push(line.into());
+            }
         }
         if cfg!(target_os = "macos") {
             if let Ok((path, _)) = run("xcodebuild", &["-find", "clang"]) {
-                paths.push(path.lines().next().unwrap().into());
+                if let Some(line) = path.lines().next() {
+                    paths.push(line.into());
+                }
             }
         }
         paths.extend(env::split_paths(&env::var("PATH").unwrap()));