Skip to content

Commit 6713be0

Browse files
committed
Rename ra_env -> ra_toolchain
1 parent 8295a93 commit 6713be0

File tree

9 files changed

+23
-21
lines changed

9 files changed

+23
-21
lines changed

Cargo.lock

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/ra_flycheck/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ log = "0.4.8"
1414
cargo_metadata = "0.9.1"
1515
serde_json = "1.0.48"
1616
jod-thread = "0.1.1"
17-
ra_env = { path = "../ra_env" }
17+
ra_toolchain = { path = "../ra_toolchain" }
1818

1919
[dev-dependencies]
2020
insta = "0.16.0"

crates/ra_flycheck/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use lsp_types::{
1616
CodeAction, CodeActionOrCommand, Diagnostic, Url, WorkDoneProgress, WorkDoneProgressBegin,
1717
WorkDoneProgressEnd, WorkDoneProgressReport,
1818
};
19-
use ra_env::get_path_for_executable;
19+
use ra_toolchain::get_path_for_executable;
2020

2121
use crate::conv::{map_rust_diagnostic_to_lsp, MappedRustDiagnostic};
2222

crates/ra_project_model/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ cargo_metadata = "0.9.1"
1616
ra_arena = { path = "../ra_arena" }
1717
ra_cfg = { path = "../ra_cfg" }
1818
ra_db = { path = "../ra_db" }
19-
ra_env = { path = "../ra_env" }
19+
ra_toolchain = { path = "../ra_toolchain" }
2020
ra_proc_macro = { path = "../ra_proc_macro" }
2121

2222
serde = { version = "1.0.106", features = ["derive"] }

crates/ra_project_model/src/cargo_workspace.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use anyhow::{Context, Result};
1111
use cargo_metadata::{BuildScript, CargoOpt, Message, MetadataCommand, PackageId};
1212
use ra_arena::{Arena, Idx};
1313
use ra_db::Edition;
14-
use ra_env::get_path_for_executable;
14+
use ra_toolchain::get_path_for_executable;
1515
use rustc_hash::FxHashMap;
1616

1717
/// `CargoWorkspace` represents the logical structure of, well, a Cargo

crates/ra_project_model/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use std::{
1414
use anyhow::{bail, Context, Result};
1515
use ra_cfg::CfgOptions;
1616
use ra_db::{CrateGraph, CrateName, Edition, Env, ExternSource, ExternSourceId, FileId};
17-
use ra_env::get_path_for_executable;
17+
use ra_toolchain::get_path_for_executable;
1818
use rustc_hash::FxHashMap;
1919
use serde_json::from_reader;
2020

crates/ra_project_model/src/sysroot.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
//! FIXME: write short doc here
22
3-
use anyhow::{bail, Context, Result};
43
use std::{
54
env, ops,
65
path::{Path, PathBuf},
76
process::{Command, Output},
87
};
98

9+
use anyhow::{bail, Context, Result};
1010
use ra_arena::{Arena, Idx};
11-
use ra_env::get_path_for_executable;
11+
use ra_toolchain::get_path_for_executable;
1212

1313
#[derive(Default, Debug, Clone)]
1414
pub struct Sysroot {

crates/ra_env/Cargo.toml renamed to crates/ra_toolchain/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
edition = "2018"
3-
name = "ra_env"
3+
name = "ra_toolchain"
44
version = "0.1.0"
55
authors = ["rust-analyzer developers"]
66

crates/ra_env/src/lib.rs renamed to crates/ra_toolchain/src/lib.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
//! This crate contains a single public function
22
//! [`get_path_for_executable`](fn.get_path_for_executable.html).
33
//! See docs there for more information.
4+
use std::{
5+
env,
6+
path::{Path, PathBuf},
7+
process::Command,
8+
};
49

510
use anyhow::{bail, Result};
6-
use std::env;
7-
use std::path::{Path, PathBuf};
8-
use std::process::Command;
911

1012
/// Return a `PathBuf` to use for the given executable.
1113
///

0 commit comments

Comments
 (0)