aconfig: remove support for --format=text
This CL is part of a larger effort to simplify maintenance by removing
format aliases: with the new --format option, clients of `aconfig dump`
can specify the format they need themselves.
This CL removes the last of the format aliases.
Bug: 317044914
Test: m
Change-Id: I09b706b9931a85a86c17be359902245b9b53d584
diff --git a/tools/aconfig/src/dump.rs b/tools/aconfig/src/dump.rs
index e242db2..37368ee 100644
--- a/tools/aconfig/src/dump.rs
+++ b/tools/aconfig/src/dump.rs
@@ -36,12 +36,6 @@
// protobuf formats
"protobuf" => Ok(Self::Protobuf),
"textproto" => Ok(Self::Textproto),
-
- // old formats now implemented as aliases to custom format
- "text" => Ok(Self::Custom(
- "{fully_qualified_name} [{container}]: {permission} + {state}".to_owned(),
- )),
-
// custom format
_ => Ok(Self::Custom(value.to_owned())),
}
@@ -265,12 +259,6 @@
"{fully_qualified_name}={permission} + {state}",
"com.android.aconfig.test.enabled_ro=READ_ONLY + ENABLED"
);
-
- // aliases
- assert_dump_parsed_flags_custom_format_contains!(
- "text",
- "com.android.aconfig.test.enabled_ro [system]: READ_ONLY + ENABLED"
- );
}
#[test]
diff --git a/tools/aconfig/src/main.rs b/tools/aconfig/src/main.rs
index 59f3677..6c4e241 100644
--- a/tools/aconfig/src/main.rs
+++ b/tools/aconfig/src/main.rs
@@ -114,7 +114,9 @@
Arg::new("format")
.long("format")
.value_parser(|s: &str| DumpFormat::try_from(s))
- .default_value("text"),
+ .default_value(
+ "{fully_qualified_name} [{container}]: {permission} + {state}",
+ ),
)
.arg(
Arg::new("filter")