@@ -1592,15 +1592,16 @@ impl Build {
15921592 }
15931593 } else if target. contains ( "watchos-sim" ) {
15941594 if let Some ( arch) =
1595- map_darwin_target_from_rust_to_compiler_architecture ( target)
1595+ map_darwin_target_from_rust_to_compiler_architecture ( target)
15961596 {
15971597 let deployment_target = env:: var ( "WATCHOS_DEPLOYMENT_TARGET" )
15981598 . unwrap_or_else ( |_| "5.0" . into ( ) ) ;
15991599 cmd. args . push (
16001600 format ! (
16011601 "--target={}-apple-watchos{}-simulator" ,
16021602 arch, deployment_target
1603- ) . into ( ) ,
1603+ )
1604+ . into ( ) ,
16041605 ) ;
16051606 }
16061607 } else if target. starts_with ( "riscv64gc-" ) {
@@ -2179,23 +2180,21 @@ impl Build {
21792180 } ) ?;
21802181
21812182 let arch = match arch {
2182- "armv7k" => ArchSpec :: Device ( "armv7k" ) ,
2183- "arm64_32" => ArchSpec :: Device ( "arm64_32" ) ,
2184- "i386" | "i686" => ArchSpec :: Simulator ( "-m32" ) ,
2185- "x86_64" => ArchSpec :: Simulator ( "-m64" ) ,
2186- _ => {
2187- return Err ( Error :: new (
2188- ErrorKind :: ArchitectureInvalid ,
2189- "Unknown architecture for watchOS target." ,
2190- ) ) ;
2191- }
2192-
2183+ "armv7k" => ArchSpec :: Device ( "armv7k" ) ,
2184+ "arm64_32" => ArchSpec :: Device ( "arm64_32" ) ,
2185+ "i386" | "i686" => ArchSpec :: Simulator ( "-m32" ) ,
2186+ "x86_64" => ArchSpec :: Simulator ( "-m64" ) ,
2187+ _ => {
2188+ return Err ( Error :: new (
2189+ ErrorKind :: ArchitectureInvalid ,
2190+ "Unknown architecture for watchOS target." ,
2191+ ) ) ;
2192+ }
21932193 } ;
21942194
21952195 let min_version =
21962196 std:: env:: var ( "WATCHOS_DEPLOYMENT_TARGET" ) . unwrap_or_else ( |_| "2.0" . into ( ) ) ;
21972197
2198-
21992198 let sdk = match arch {
22002199 ArchSpec :: Device ( arch) => {
22012200 cmd. args . push ( "-arch" . into ( ) ) ;
0 commit comments