Unnamed repository; edit this file 'description' to name the repository.
Inline toolchain_info module
| -rw-r--r-- | crates/project-model/src/lib.rs | 19 | ||||
| -rw-r--r-- | crates/project-model/src/toolchain_info.rs | 16 | ||||
| -rw-r--r-- | crates/project-model/src/toolchain_info/target_triple.rs | 1 |
3 files changed, 19 insertions, 17 deletions
diff --git a/crates/project-model/src/lib.rs b/crates/project-model/src/lib.rs index 2dd9c54e0c..1913db11fa 100644 --- a/crates/project-model/src/lib.rs +++ b/crates/project-model/src/lib.rs @@ -16,7 +16,24 @@ //! * Lowering of concrete model to a [`base_db::CrateGraph`] pub mod project_json; -pub mod toolchain_info; +pub mod toolchain_info { + pub mod rustc_cfg; + pub mod target_data_layout; + pub mod target_triple; + + use std::path::Path; + + use crate::{ManifestPath, Sysroot}; + + #[derive(Copy, Clone)] + pub enum QueryConfig<'a> { + /// Directly invoke `rustc` to query the desired information. + Rustc(&'a Sysroot, &'a Path), + /// Attempt to use cargo to query the desired information, honoring cargo configurations. + /// If this fails, falls back to invoking `rustc` directly. + Cargo(&'a Sysroot, &'a ManifestPath), + } +} mod build_dependencies; mod cargo_workspace; diff --git a/crates/project-model/src/toolchain_info.rs b/crates/project-model/src/toolchain_info.rs deleted file mode 100644 index 6c8152262c..0000000000 --- a/crates/project-model/src/toolchain_info.rs +++ /dev/null @@ -1,16 +0,0 @@ -pub mod rustc_cfg; -pub mod target_data_layout; -pub mod target_triple; - -use std::path::Path; - -use crate::{ManifestPath, Sysroot}; - -#[derive(Copy, Clone)] -pub enum QueryConfig<'a> { - /// Directly invoke `rustc` to query the desired information. - Rustc(&'a Sysroot, &'a Path), - /// Attempt to use cargo to query the desired information, honoring cargo configurations. - /// If this fails, falls back to invoking `rustc` directly. - Cargo(&'a Sysroot, &'a ManifestPath), -} diff --git a/crates/project-model/src/toolchain_info/target_triple.rs b/crates/project-model/src/toolchain_info/target_triple.rs index 2d0d4a7c50..163884e5e8 100644 --- a/crates/project-model/src/toolchain_info/target_triple.rs +++ b/crates/project-model/src/toolchain_info/target_triple.rs @@ -1,3 +1,4 @@ +//! Functionality to discover the current build target(s). use std::path::Path; use anyhow::Context; |