From da4271b3f8d5f550e47d61a11a7b6935151ad4b0 Mon Sep 17 00:00:00 2001
From: Lucas Pickering <lucas@lucaspickering.me>
Date: Thu, 3 Oct 2024 21:29:54 -0400
Subject: [PATCH] Upgrade Rust to 1.80

---
 CHANGELOG.md          | 4 ++++
 Cargo.toml            | 2 +-
 rust-toolchain.toml   | 2 +-
 src/config/qualify.rs | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d19ebeb..6417d8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased - [ReleaseDate]
 
+### Changed
+
+- Upgrade Rust version to 1.80.0
+
 ### Fixed
 
 - Do not load config for subcommands that don't need it (e.g. `es init`)
diff --git a/Cargo.toml b/Cargo.toml
index 9fea306..f1ad3b1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT"
 name = "env-select"
 repository = "https://github.com/LucasPickering/env-select"
 # Keep in sync w/ rust-toolchain.toml
-rust-version = "1.72.0"
+rust-version = "1.80.0"
 version = "1.1.3"
 
 [[bin]]
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 75dc474..37edc2e 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
 # Keep in sync w/ Cargo.toml
-channel = "1.72.0"
+channel = "1.80.0"
 components = ["cargo", "clippy", "rustfmt"]
diff --git a/src/config/qualify.rs b/src/config/qualify.rs
index 8d08267..1909f21 100644
--- a/src/config/qualify.rs
+++ b/src/config/qualify.rs
@@ -116,7 +116,7 @@ impl<'a> Qualify<'a> for PathBuf {
     /// path (if this path is relative).
     fn qualify(&mut self, config_path: &Self::Context) {
         let new_path = match config_path.parent() {
-            Some(directory) => directory.join(&self),
+            Some(directory) => directory.join(self.as_path()),
             None => panic!(
                 "Qualification context should be a path to a \
                 config file, but got {config_path:?}"