Upgrade Rust to 1.80

LucasPickering · Oct 4, 2024 · c6e5218 · c6e5218
1 parent 711086f
commit c6e5218
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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:?}"