chore: file renaming

13 files changed, 24 insertions, 25 deletions

diff --git a/library/stdarch/crates/intrinsic-test/src/arm/functions.rs b/library/stdarch/crates/intrinsic-test/src/arm/functions.rs
index f471c4b33d4..23676247b26 100644
--- a/library/stdarch/crates/intrinsic-test/src/arm/functions.rs
+++ b/library/stdarch/crates/intrinsic-test/src/arm/functions.rs
@@ -3,11 +3,11 @@ use super::intrinsic::ArmIntrinsicType;
 use crate::arm::constraint::Constraint;
 use crate::common::argument::Argument;
 use crate::common::compile_c::CompilationCommandBuilder;
-use crate::common::format::Indentation;
 use crate::common::gen_c::{compile_c, create_c_filenames, generate_c_program};
 use crate::common::gen_rust::{compile_rust, create_rust_filenames, generate_rust_program};
+use crate::common::indentation::Indentation;
 use crate::common::intrinsic::{Intrinsic, IntrinsicDefinition};
-use crate::common::intrinsic_types::IntrinsicTypeDefinition;
+use crate::common::intrinsic_helpers::IntrinsicTypeDefinition;
 use crate::common::write_file;
 use itertools::Itertools;
 use rayon::prelude::*;
diff --git a/library/stdarch/crates/intrinsic-test/src/arm/intrinsic.rs b/library/stdarch/crates/intrinsic-test/src/arm/intrinsic.rs
index 38aa3eb697a..82b271647e7 100644
--- a/library/stdarch/crates/intrinsic-test/src/arm/intrinsic.rs
+++ b/library/stdarch/crates/intrinsic-test/src/arm/intrinsic.rs
@@ -1,12 +1,12 @@
 use super::constraint::Constraint;
 use crate::base_intrinsictype_trait_def_macro;
 use crate::common::argument::ArgumentList;
-use crate::common::format::Indentation;
+use crate::common::cli::Language;
+use crate::common::indentation::Indentation;
 use crate::common::intrinsic::{Intrinsic, IntrinsicDefinition};
-use crate::common::intrinsic_types::{
+use crate::common::intrinsic_helpers::{
     BaseIntrinsicTypeDefinition, IntrinsicTypeDefinition, TypeKind,
 };
-use crate::common::types::Language;
 
 base_intrinsictype_trait_def_macro! {ArmIntrinsicType}
 
diff --git a/library/stdarch/crates/intrinsic-test/src/arm/json_parser.rs b/library/stdarch/crates/intrinsic-test/src/arm/json_parser.rs
index 4415459a3ec..fc3bd6a8b11 100644
--- a/library/stdarch/crates/intrinsic-test/src/arm/json_parser.rs
+++ b/library/stdarch/crates/intrinsic-test/src/arm/json_parser.rs
@@ -2,7 +2,7 @@ use super::constraint::Constraint;
 use super::intrinsic::ArmIntrinsicType;
 use crate::common::argument::{Argument, ArgumentList};
 use crate::common::intrinsic::Intrinsic;
-use crate::common::intrinsic_types::{IntrinsicType, IntrinsicTypeDefinition};
+use crate::common::intrinsic_helpers::{IntrinsicType, IntrinsicTypeDefinition};
 use serde::Deserialize;
 use serde_json::Value;
 use std::collections::HashMap;
diff --git a/library/stdarch/crates/intrinsic-test/src/arm/mod.rs b/library/stdarch/crates/intrinsic-test/src/arm/mod.rs
index 9bee5a1d7bf..c626bc97406 100644
--- a/library/stdarch/crates/intrinsic-test/src/arm/mod.rs
+++ b/library/stdarch/crates/intrinsic-test/src/arm/mod.rs
@@ -8,10 +8,10 @@ mod types;
 use crate::arm::constraint::Constraint;
 use crate::arm::intrinsic::ArmIntrinsicType;
 use crate::common::SupportedArchitectureTest;
+use crate::common::cli::ProcessedCli;
 use crate::common::compare::compare_outputs;
 use crate::common::intrinsic::Intrinsic;
-use crate::common::intrinsic_types::{BaseIntrinsicTypeDefinition, TypeKind};
-use crate::common::types::ProcessedCli;
+use crate::common::intrinsic_helpers::{BaseIntrinsicTypeDefinition, TypeKind};
 use functions::{build_c, build_rust};
 use json_parser::get_neon_intrinsics;
 
diff --git a/library/stdarch/crates/intrinsic-test/src/arm/types.rs b/library/stdarch/crates/intrinsic-test/src/arm/types.rs
index db08c3a52dd..231fa181ad7 100644
--- a/library/stdarch/crates/intrinsic-test/src/arm/types.rs
+++ b/library/stdarch/crates/intrinsic-test/src/arm/types.rs
@@ -1,6 +1,6 @@
 use super::intrinsic::ArmIntrinsicType;
-use crate::common::intrinsic_types::{IntrinsicType, IntrinsicTypeDefinition, TypeKind};
-use crate::common::types::Language;
+use crate::common::cli::Language;
+use crate::common::intrinsic_helpers::{IntrinsicType, IntrinsicTypeDefinition, TypeKind};
 
 impl IntrinsicTypeDefinition for ArmIntrinsicType {
     /// Gets a string containing the typename for this type in C format.
diff --git a/library/stdarch/crates/intrinsic-test/src/common/argument.rs b/library/stdarch/crates/intrinsic-test/src/common/argument.rs
index 08d6ca15239..de179437bf0 100644
--- a/library/stdarch/crates/intrinsic-test/src/common/argument.rs
+++ b/library/stdarch/crates/intrinsic-test/src/common/argument.rs
@@ -1,7 +1,6 @@
-use crate::common::format::Indentation;
-use crate::common::intrinsic_types::IntrinsicTypeDefinition;
-use crate::common::types::Language;
-use serde_json::Value;
+use crate::common::cli::Language;
+use crate::common::indentation::Indentation;
+use crate::common::intrinsic_helpers::IntrinsicTypeDefinition;
 
 /// An argument for the intrinsic.
 #[derive(Debug, PartialEq, Clone)]
diff --git a/library/stdarch/crates/intrinsic-test/src/common/types.rs b/library/stdarch/crates/intrinsic-test/src/common/cli.rs
index 53bda97df47..9345761cf18 100644
--- a/library/stdarch/crates/intrinsic-test/src/common/types.rs
+++ b/library/stdarch/crates/intrinsic-test/src/common/cli.rs
@@ -44,7 +44,7 @@ pub struct Cli {
     pub generate_only: bool,
 
     /// Pass a target the test suite
-    #[arg(long, default_value_t = String::from("aarch64-unknown-linux-gnu"))]
+    #[arg(long, default_value_t = String::from("armv7-unknown-linux-gnueabihf"))]
     pub target: String,
 
     /// Set the linker
diff --git a/library/stdarch/crates/intrinsic-test/src/common/compare.rs b/library/stdarch/crates/intrinsic-test/src/common/compare.rs
index 4c2cbd1f3ae..815ccf89fc6 100644
--- a/library/stdarch/crates/intrinsic-test/src/common/compare.rs
+++ b/library/stdarch/crates/intrinsic-test/src/common/compare.rs
@@ -1,4 +1,4 @@
-use super::types::FailureReason;
+use super::cli::FailureReason;
 use rayon::prelude::*;
 use std::process::Command;
 
diff --git a/library/stdarch/crates/intrinsic-test/src/common/format.rs b/library/stdarch/crates/intrinsic-test/src/common/indentation.rs
index 9ee331d7f7a..9ee331d7f7a 100644
--- a/library/stdarch/crates/intrinsic-test/src/common/format.rs
+++ b/library/stdarch/crates/intrinsic-test/src/common/indentation.rs
diff --git a/library/stdarch/crates/intrinsic-test/src/common/intrinsic.rs b/library/stdarch/crates/intrinsic-test/src/common/intrinsic.rs
index 5322ebf914a..7117c14488b 100644
--- a/library/stdarch/crates/intrinsic-test/src/common/intrinsic.rs
+++ b/library/stdarch/crates/intrinsic-test/src/common/intrinsic.rs
@@ -1,6 +1,6 @@
 use crate::common::argument::ArgumentList;
-use crate::common::format::Indentation;
-use crate::common::intrinsic_types::IntrinsicTypeDefinition;
+use crate::common::indentation::Indentation;
+use crate::common::intrinsic_helpers::IntrinsicTypeDefinition;
 
 use super::argument::MetadataDefinition;
 
diff --git a/library/stdarch/crates/intrinsic-test/src/common/intrinsic_types.rs b/library/stdarch/crates/intrinsic-test/src/common/intrinsic_helpers.rs
index 9cd74fa71f5..473585c8149 100644
--- a/library/stdarch/crates/intrinsic-test/src/common/intrinsic_types.rs
+++ b/library/stdarch/crates/intrinsic-test/src/common/intrinsic_helpers.rs
@@ -3,8 +3,8 @@ use std::str::FromStr;
 
 use itertools::Itertools as _;
 
-use crate::common::format::Indentation;
-use crate::common::types::Language;
+use crate::common::cli::Language;
+use crate::common::indentation::Indentation;
 use crate::common::values::value_for_array;
 
 #[derive(Debug, PartialEq, Copy, Clone)]
diff --git a/library/stdarch/crates/intrinsic-test/src/common/mod.rs b/library/stdarch/crates/intrinsic-test/src/common/mod.rs
index 606ab4fdf3b..225557b18d6 100644
--- a/library/stdarch/crates/intrinsic-test/src/common/mod.rs
+++ b/library/stdarch/crates/intrinsic-test/src/common/mod.rs
@@ -1,16 +1,16 @@
-use crate::common::types::ProcessedCli;
+use crate::common::cli::ProcessedCli;
 use std::fs::File;
 use std::io::Write;
 
 pub mod argument;
+pub mod cli;
 pub mod compare;
 pub mod compile_c;
-pub mod format;
 pub mod gen_c;
 pub mod gen_rust;
+pub mod indentation;
 pub mod intrinsic;
-pub mod intrinsic_types;
-pub mod types;
+pub mod intrinsic_helpers;
 pub mod values;
 
 /// Architectures must support this trait
diff --git a/library/stdarch/crates/intrinsic-test/src/main.rs b/library/stdarch/crates/intrinsic-test/src/main.rs
index 0e168a53f5d..686f750e32f 100644
--- a/library/stdarch/crates/intrinsic-test/src/main.rs
+++ b/library/stdarch/crates/intrinsic-test/src/main.rs
@@ -7,7 +7,7 @@ mod common;
 
 use arm::ArmArchitectureTest;
 use common::SupportedArchitectureTest;
-use common::types::{Cli, ProcessedCli};
+use common::cli::{Cli, ProcessedCli};
 
 fn main() {
     pretty_env_logger::init();