From 0be57f121b446537240d2226d940ec5fcc8c5788 Mon Sep 17 00:00:00 2001
From: Kubaryt <kubastarzyk6554@gmail.com>
Date: Thu, 28 Aug 2025 14:14:08 +0200
Subject: [PATCH] combine rust-src-dir presence and rust_toolchain file
 presence checks

---
 README.md  |  2 +-
 action.yml | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index bd3fb9d..44fb937 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ Afterward, the `components` and `target` specified via inputs are installed in a
 | `matcher`                | Enable problem matcher to surface build messages and formatting issues                                                  | true          |
 | `rustflags`              | Set the value of `RUSTFLAGS` (set to empty string to avoid overwriting existing flags)                                  | "-D warnings" |
 | `override`               | Setup the last installed toolchain as the default via `rustup override`                                                 | true          |
-| `rust-toolchain-dir`     | Path from root directory to directory with the rust toolchain file (if its not in the root of the repository)           |               |
+| `rust-src-dir`           | Path from root directory to directory with the Rust source directory (if its not in the root of the repository)         |               |
 
 [`Swatinem/rust-cache`]: https://github.com/Swatinem/rust-cache
 
diff --git a/action.yml b/action.yml
index 0841e54..44509ee 100644
--- a/action.yml
+++ b/action.yml
@@ -69,8 +69,8 @@ inputs:
     description: "Setup the last installed toolchain as the default via `rustup override`"
     required: false
     default: "true"
-  rust-toolchain-dir:
-    description: "Specify path from root directory to the directory to search for rust-toolchain.toml file. By default root directory will be used."
+  rust-src-dir:
+    description: "Specify path from root directory to the Rust source directory. By default root directory will be used."
     required: false
 
 outputs:
@@ -166,18 +166,18 @@ runs:
         targets: ${{inputs.target}}
         components: ${{inputs.components}}
         override: ${{inputs.override}}
-        rust_toolchain_dir: ${{inputs.rust-toolchain-dir}}
+        rust_src_dir: ${{inputs.rust-src-dir}}
       shell: bash
       run: |
-        if [[ -z "$toolchain" && ( -f "rust-toolchain" || -f "rust-toolchain.toml" || -f "$rust_toolchain_dir/rust-toolchain.toml") ]]
+        if [[ -d "$rust_src_dir" ]]; then
+          cd "$rust_src_dir"
+        fi
+        if [[ -z "$toolchain" && ( -f "rust-toolchain" || -f "rust-toolchain.toml") ]]
         then
           # Install the toolchain as specified in the file
           # rustup show is the old way that implicitly installed a toolchain
           # rustup toolchain install is the new explicit way
           # https://github.com/rust-lang/rustup/issues/3635#issuecomment-2343511297
-          if [[ -n "$rust_toolchain_dir" ]]; then
-              cd "$rust_toolchain_dir"
-          fi
           rustup show active-toolchain || rustup toolchain install
           if [[ -n $components ]]; then
             rustup component add ${components//,/ }