Rename CompilerBackend to CrossCompiler

rust-cross · Dec 21, 2024 · d1a7a32 · d1a7a32
1 parent ab11dca
commit d1a7a32
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 12 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -27,6 +27,9 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         toolchain: [stable, nightly]
+        cross-compiler: [clang-cl, clang]
+    env:
+      XWIN_CROSS_COMPILER: ${{ matrix.cross-compiler }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/checkout@v4

diff --git a/src/common.rs b/src/common.rs
@@ -10,9 +10,9 @@ use clap::{
 use fs_err as fs;
 use which::which_in;
 
-/// MSVC cross compiler backend
+/// MSVC cross compiler
 #[derive(Clone, Debug, Default, ValueEnum)]
-pub enum CompilerBackend {
+pub enum CrossCompiler {
     /// clang-cl backend
     #[default]
     ClangCl,
@@ -23,9 +23,9 @@ pub enum CompilerBackend {
 /// common xwin options
 #[derive(Clone, Debug, Parser)]
 pub struct XWinOptions {
-    /// The cross compiler backend to use
-    #[arg(long, env = "XWIN_COMPILER_BACKEND", default_value = "clang-cl")]
-    pub compiler_backend: CompilerBackend,
+    /// The cross compiler to use
+    #[arg(long, env = "XWIN_CROSS_COMPILER", default_value = "clang-cl")]
+    pub cross_compiler: CrossCompiler,
 
     /// xwin cache directory
     #[arg(long, env = "XWIN_CACHE_DIR", hide = true)]
@@ -78,7 +78,7 @@ impl Default for XWinOptions {
             xwin_version: "16".to_string(),
             xwin_include_debug_libs: false,
             xwin_include_debug_symbols: false,
-            compiler_backend: CompilerBackend::ClangCl,
+            cross_compiler: CrossCompiler::ClangCl,
         }
     }
 }
@@ -90,13 +90,13 @@ impl XWinOptions {
         cargo: &cargo_options::CommonOptions,
         cmd: &mut Command,
     ) -> Result<()> {
-        match self.compiler_backend {
-            CompilerBackend::ClangCl => {
-                let clang_cl = crate::backend::clang_cl::ClangCl::new(self);
+        match self.cross_compiler {
+            CrossCompiler::ClangCl => {
+                let clang_cl = crate::compiler::clang_cl::ClangCl::new(self);
                 clang_cl.apply_command_env(manifest_path, cargo, cmd)?;
             }
-            CompilerBackend::Clang => {
-                let clang = crate::backend::clang::Clang::new(self);
+            CrossCompiler::Clang => {
+                let clang = crate::compiler::clang::Clang::new(self);
                 clang.apply_command_env(manifest_path, cargo, cmd)?;
             }
         }

diff --git a/src/backend/clang.rs → src/compiler/clang.rs b/src/backend/clang.rs → src/compiler/clang.rs
diff --git a/src/backend/clang_cl.rs → src/compiler/clang_cl.rs b/src/backend/clang_cl.rs → src/compiler/clang_cl.rs
diff --git a/src/backend/mod.rs → src/compiler/mod.rs b/src/backend/mod.rs → src/compiler/mod.rs
diff --git a/src/backend/override.cmake → src/compiler/override.cmake b/src/backend/override.cmake → src/compiler/override.cmake
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,5 +1,5 @@
-mod backend;
 mod common;
+mod compiler;
 mod macros;
 mod run;
 mod test;