Format cg_gcc with same formatting parameters

Author: GuillaumeGomez

build_system/src/clone_gcc.rs

@@ -34,7 +34,7 @@ impl Args {
 "--out-path" => match args.next(){
 Some(path)if !path.is_empty() => out_path = Some(path),
  _ => {
-returnErr("Expected an argument after `--out-path`, found nothing".into())
+returnErr("Expected an argument after `--out-path`, found nothing".into());
 }
 },
 "--help" => {

build_system/src/config.rs

@@ -54,7 +54,7 @@ impl ConfigFile {
  config.gcc_path = Some(value.as_str().to_string())
 }
 ("gcc-path", _) => {
-returnfailed_config_parsing(config_file,"Expected a string for `gcc-path`")
+returnfailed_config_parsing(config_file,"Expected a string for `gcc-path`");
 }
 ("download-gccjit",TomlValue::Boolean(value)) => {
  config.download_gccjit = Some(*value)
@@ -63,7 +63,7 @@ impl ConfigFile {
 returnfailed_config_parsing(
  config_file,
 "Expected a boolean for `download-gccjit`",
-)
+);
 }
  _ => returnfailed_config_parsing(config_file,&format!("Unknown key `{}`", key)),
 }
@@ -73,7 +73,7 @@ impl ConfigFile {
 returnfailed_config_parsing(
  config_file,
 "At least one of `gcc-path` or `download-gccjit` value must be set",
-)
+);
 }
 (Some(_),Some(true)) => {
 println!(
@@ -144,7 +144,7 @@ impl ConfigInfo {
  _ => {
 returnErr(
 "Expected a value after `--target-triple`, found nothing".to_string()
-)
+);
 }
 },
 "--out-dir" => match args.next(){
@@ -158,7 +158,7 @@ impl ConfigInfo {
 self.config_file = Some(arg.to_string());
 }
  _ => {
-returnErr("Expected a value after `--config-file`, found nothing".to_string())
+returnErr("Expected a value after `--config-file`, found nothing".to_string());
 }
 },
 "--release-sysroot" => self.sysroot_release_channel = true,
@@ -169,7 +169,7 @@ impl ConfigInfo {
 self.cg_gcc_path = Some(arg.into());
 }
  _ => {
-returnErr("Expected a value after `--cg_gcc-path`, found nothing".to_string())
+returnErr("Expected a value after `--cg_gcc-path`, found nothing".to_string());
 }
 },
 "--use-backend" => match args.next(){
@@ -277,7 +277,7 @@ impl ConfigInfo {
 self.gcc_path = match gcc_path {
 Some(path) => path,
 None => {
-returnErr(format!("missing `gcc-path` value from `{}`", config_file.display(),))
+returnErr(format!("missing `gcc-path` value from `{}`", config_file.display(),));
 }
 };
 Ok(())

build_system/src/test.rs

@@ -109,7 +109,7 @@ impl TestArg {
  test_arg.flags.extend_from_slice(&["--features".into(), feature]);
 }
  _ => {
-returnErr("Expected an argument after `--features`, found nothing".into())
+returnErr("Expected an argument after `--features`, found nothing".into());
 }
 },
 "--use-system-gcc" => {
@@ -458,11 +458,7 @@ fn setup_rustc(env: &mut Env, args: &TestArg) -> Result<PathBuf, String> {
 .map_err(|error| format!("Failed to retrieve cargo path: {:?}", error))
 .and_then(|cargo| {
 let cargo = cargo.trim().to_owned();
-if cargo.is_empty(){
-Err(format!("`cargo` path is empty"))
-}else{
-Ok(cargo)
-}
+if cargo.is_empty(){Err(format!("`cargo` path is empty"))}else{Ok(cargo)}
 })?;
 let rustc = String::from_utf8(
 run_command_with_env(&[&"rustup",&toolchain,&"which",&"rustc"], rust_dir,Some(env))?
@@ -471,11 +467,7 @@ fn setup_rustc(env: &mut Env, args: &TestArg) -> Result<PathBuf, String> {
 .map_err(|error| format!("Failed to retrieve rustc path: {:?}", error))
 .and_then(|rustc| {
 let rustc = rustc.trim().to_owned();
-if rustc.is_empty(){
-Err(format!("`rustc` path is empty"))
-}else{
-Ok(rustc)
-}
+if rustc.is_empty(){Err(format!("`rustc` path is empty"))}else{Ok(rustc)}
 })?;
 let llvm_filecheck = matchrun_command_with_env(
 &[

build_system/src/utils.rs

@@ -175,11 +175,7 @@ pub fn cargo_install(to_install: &str) -> Result<(), String> {
 pubfnget_os_name() -> Result<String,String>{
 let output = run_command(&[&"uname"],None)?;
 let name = std::str::from_utf8(&output.stdout).unwrap_or("").trim().to_string();
-if !name.is_empty(){
-Ok(name)
-}else{
-Err("Failed to retrieve the OS name".to_string())
-}
+if !name.is_empty(){Ok(name)}else{Err("Failed to retrieve the OS name".to_string())}
 }
 
 #[derive(Default,PartialEq)]

src/abi.rs

@@ -26,11 +26,7 @@ impl<'a, 'gcc, 'tcx> AbiBuilderMethods<'tcx> for Builder<'a, 'gcc, 'tcx> {
 }else{
 false
 };
-if on_stack {
- param.to_lvalue().get_address(None)
-}else{
- param.to_rvalue()
-}
+if on_stack { param.to_lvalue().get_address(None)}else{ param.to_rvalue()}
 }
 }
 

src/asm.rs

@@ -858,11 +858,7 @@ fn modifier_to_gcc(
 InlineAsmRegClass::AArch64(AArch64InlineAsmRegClass::reg) => modifier,
 InlineAsmRegClass::AArch64(AArch64InlineAsmRegClass::vreg)
  | InlineAsmRegClass::AArch64(AArch64InlineAsmRegClass::vreg_low16) => {
-if modifier == Some('v'){
-None
-}else{
- modifier
-}
+if modifier == Some('v'){None}else{ modifier }
 }
 InlineAsmRegClass::AArch64(AArch64InlineAsmRegClass::preg) => {
 unreachable!("clobber-only")

src/builder.rs

@@ -1030,11 +1030,7 @@ impl<'a, 'gcc, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'gcc, 'tcx> {
 let llty = place.layout.scalar_pair_element_gcc_type(self, i);
 let load = self.load(llty, llptr, align);
 scalar_load_metadata(self, load, scalar);
-if scalar.is_bool(){
-self.trunc(load,self.type_i1())
-}else{
- load
-}
+if scalar.is_bool(){self.trunc(load,self.type_i1())}else{ load }
 };
 
 OperandValue::Pair(
@@ -1782,18 +1778,10 @@ impl<'a, 'gcc, 'tcx> Builder<'a, 'gcc, 'tcx> {
 // This already happens today with u128::MAX = 2^128 - 1 > f32::MAX.
 let int_max = |signed:bool,int_width:u64| -> u128{
 let shift_amount = 128 - int_width;
-if signed {
- i128::MAXasu128 >> shift_amount
-}else{
- u128::MAX >> shift_amount
-}
+if signed { i128::MAXasu128 >> shift_amount }else{ u128::MAX >> shift_amount }
 };
 let int_min = |signed:bool,int_width:u64| -> i128{
-if signed {
- i128::MIN >> (128 - int_width)
-}else{
-0
-}
+if signed { i128::MIN >> (128 - int_width)}else{0}
 };
 
 let compute_clamp_bounds_single = |signed:bool,int_width:u64| -> (u128,u128){

src/common.rs

@@ -58,11 +58,7 @@ pub fn type_is_pointer(typ: Type<'_>) -> bool {
 
 impl<'gcc,'tcx>ConstMethods<'tcx>forCodegenCx<'gcc,'tcx>{
 fnconst_null(&self,typ:Type<'gcc>) -> RValue<'gcc>{
-iftype_is_pointer(typ){
-self.context.new_null(typ)
-}else{
-self.const_int(typ,0)
-}
+iftype_is_pointer(typ){self.context.new_null(typ)}else{self.const_int(typ,0)}
 }
 
 fnconst_undef(&self,typ:Type<'gcc>) -> RValue<'gcc>{