From 2faf1159fa63d6935600145ffb81608e907a831b Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Thu, 9 May 2024 14:20:57 -0500
Subject: [PATCH] Upgrade to rsconf 0.2.0

---
 Cargo.lock |  4 ++--
 Cargo.toml |  2 +-
 build.rs   | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ed46edcb4..5354ef069 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -433,9 +433,9 @@ dependencies = [
 
 [[package]]
 name = "rsconf"
-version = "0.1.2"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b9653c00e095416c7586382524a5ede22b9dec6f067879bd7eed21429721e6d"
+checksum = "5a21859ed369f0e06a22264093fcb2f3baec914b5be39f3fb8533056cad136cc"
 dependencies = [
  "cc",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index b8024a7ff..270da36eb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,7 +45,7 @@ serial_test = { version = "1.0.0", default-features = false }
 
 [build-dependencies]
 cc = "1.0.94"
-rsconf = "0.1.2"
+rsconf = "0.2.0"
 
 [lib]
 crate-type = ["rlib"]
diff --git a/build.rs b/build.rs
index 82240c21d..bae1daaa3 100644
--- a/build.rs
+++ b/build.rs
@@ -75,19 +75,19 @@ fn detect_cfgs(target: &mut Target) {
         ("gettext", &have_gettext),
         // See if libc supports the thread-safe localeconv_l(3) alternative to localeconv(3).
         ("localeconv_l", &|target| {
-            Ok(target.has_symbol("localeconv_l", None))
+            Ok(target.has_symbol("localeconv_l"))
         }),
         ("FISH_USE_POSIX_SPAWN", &|target| {
             Ok(target.has_header("spawn.h"))
         }),
         ("HAVE_PIPE2", &|target| {
-            Ok(target.has_symbol("pipe2", None))
+            Ok(target.has_symbol("pipe2"))
         }),
         ("HAVE_EVENTFD", &|target| {
             Ok(target.has_header("sys/eventfd.h"))
         }),
         ("HAVE_WAITSTATUS_SIGNAL_RET", &|target| {
-            Ok(target.r#if("WEXITSTATUS(0x007f) == 0x7f", "sys/wait.h"))
+            Ok(target.r#if("WEXITSTATUS(0x007f) == 0x7f", &["sys/wait.h"]))
         }),
     ] {
         match handler(target) {
@@ -144,13 +144,13 @@ fn have_gettext(target: &Target) -> Result<bool, Box<dyn Error>> {
     for symbol in &symbols {
         // Historically, libintl was required in order to use gettext() and co, but that
         // functionality was subsumed by some versions of libc.
-        if target.has_symbol(symbol, None) {
+        if target.has_symbol(symbol) {
             // No need to link anything special for this symbol
             found += 1;
             continue;
         }
         for library in ["intl", "gettextlib"] {
-            if target.has_symbol(symbol, library) {
+            if target.has_symbol_in(symbol, &[library]) {
                 libraries.push(library);
                 found += 1;
                 continue;