From 6713be0b130670324c61d9deb38b7b6aee6a8bac Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 8 May 2020 12:25:36 +0200
Subject: Rename ra_env -> ra_toolchain

---
 crates/ra_env/Cargo.toml |  9 -------
 crates/ra_env/src/lib.rs | 66 ------------------------------------------------
 2 files changed, 75 deletions(-)
 delete mode 100644 crates/ra_env/Cargo.toml
 delete mode 100644 crates/ra_env/src/lib.rs

(limited to 'crates/ra_env')

diff --git a/crates/ra_env/Cargo.toml b/crates/ra_env/Cargo.toml
deleted file mode 100644
index f0a401be5..000000000
--- a/crates/ra_env/Cargo.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[package]
-edition = "2018"
-name = "ra_env"
-version = "0.1.0"
-authors = ["rust-analyzer developers"]
-
-[dependencies]
-anyhow = "1.0.26"
-home = "0.5.3"
diff --git a/crates/ra_env/src/lib.rs b/crates/ra_env/src/lib.rs
deleted file mode 100644
index 413da1982..000000000
--- a/crates/ra_env/src/lib.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-//! This crate contains a single public function
-//! [`get_path_for_executable`](fn.get_path_for_executable.html).
-//! See docs there for more information.
-
-use anyhow::{bail, Result};
-use std::env;
-use std::path::{Path, PathBuf};
-use std::process::Command;
-
-/// Return a `PathBuf` to use for the given executable.
-///
-/// E.g., `get_path_for_executable("cargo")` may return just `cargo` if that
-/// gives a valid Cargo executable; or it may return a full path to a valid
-/// Cargo.
-pub fn get_path_for_executable(executable_name: impl AsRef<str>) -> Result<PathBuf> {
-    // The current implementation checks three places for an executable to use:
-    // 1) Appropriate environment variable (erroring if this is set but not a usable executable)
-    //      example: for cargo, this checks $CARGO environment variable; for rustc, $RUSTC; etc
-    // 2) `<executable_name>`
-    //      example: for cargo, this tries just `cargo`, which will succeed if `cargo` is on the $PATH
-    // 3) `~/.cargo/bin/<executable_name>`
-    //      example: for cargo, this tries ~/.cargo/bin/cargo
-    //      It seems that this is a reasonable place to try for cargo, rustc, and rustup
-    let executable_name = executable_name.as_ref();
-    let env_var = executable_name.to_ascii_uppercase();
-    if let Ok(path) = env::var(&env_var) {
-        if is_valid_executable(&path) {
-            Ok(path.into())
-        } else {
-            bail!(
-                "`{}` environment variable points to something that's not a valid executable",
-                env_var
-            )
-        }
-    } else {
-        if is_valid_executable(executable_name) {
-            return Ok(executable_name.into());
-        }
-        if let Some(mut path) = ::home::home_dir() {
-            path.push(".cargo");
-            path.push("bin");
-            path.push(executable_name);
-            if is_valid_executable(&path) {
-                return Ok(path);
-            }
-        }
-        // This error message may also be caused by $PATH or $CARGO/$RUSTC/etc not being set correctly
-        // for VSCode, even if they are set correctly in a terminal.
-        // On macOS in particular, launching VSCode from terminal with `code <dirname>` causes VSCode
-        // to inherit environment variables including $PATH, $CARGO, $RUSTC, etc from that terminal;
-        // but launching VSCode from Dock does not inherit environment variables from a terminal.
-        // For more discussion, see #3118.
-        bail!(
-            "Failed to find `{}` executable. Make sure `{}` is in `$PATH`, or set `${}` to point to a valid executable.",
-            executable_name, executable_name, env_var
-        )
-    }
-}
-
-/// Does the given `Path` point to a usable executable?
-///
-/// (assumes the executable takes a `--version` switch and writes to stdout,
-/// which is true for `cargo`, `rustc`, and `rustup`)
-fn is_valid_executable(p: impl AsRef<Path>) -> bool {
-    Command::new(p.as_ref()).arg("--version").output().is_ok()
-}
-- 
cgit v1.2.3