Skip to content

Commit 970d4c2

Browse files
Update Rust.kt
1 parent 2b24f9d commit 970d4c2

File tree

1 file changed

+9
-14
lines changed
  • codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/testutil

1 file changed

+9
-14
lines changed

codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/testutil/Rust.kt

+9-14
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,16 @@ import kotlin.io.path.absolutePathString
4444

4545
// cargo commands and env values
4646
private object Commands {
47+
const val CargoFmt = "cargo fmt"
48+
const val CargoClippy = "cargo clippy"
49+
4750
private const val cfgUnstable = "--cfg aws_sdk_unstable"
48-
fun func(s: String, add: String, flag: Boolean): String = if (flag) { "$s $add" } else { s }
51+
private const val allFeature = "--all-features"
52+
53+
// helper
54+
private fun func(s: String, add: String, flag: Boolean): String = if (flag) { "$s $add" } else { s }
4955

56+
// unstable flag
5057
fun cargoEnvDenyWarnings(enableUnstable: Boolean): Map<String, String> {
5158
return mapOf(
5259
"RUSTFLAGS" to func("-D warnings", cfgUnstable, enableUnstable),
@@ -59,26 +66,14 @@ private object Commands {
5966
)
6067
}
6168

62-
private const val allFeature = "--all-features"
63-
69+
// --all-features
6470
fun cargoTest(enableAllFeatures: Boolean): String {
6571
return func("cargo test", allFeature, enableAllFeatures)
6672
}
6773

68-
fun cargoTest(featuresToEnable: Array<String>): String {
69-
return func("cargo test", featuresToEnable.joinToString(" "), true)
70-
}
71-
7274
fun cargoCheck(enableAllFeatures: Boolean): String {
7375
return func("cargo check", allFeature, enableAllFeatures)
7476
}
75-
76-
fun cargoCheck(featuresToEnable: Array<String>): String {
77-
return func("cargo test", featuresToEnable.joinToString(" "), true)
78-
}
79-
80-
const val CargoFmt = "cargo fmt"
81-
const val CargoClippy = "cargo clippy"
8277
}
8378

8479
val TestModuleDocProvider = object : ModuleDocProvider {

0 commit comments

Comments
 (0)