StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "aconfig-remove-format-aliases" into main

Browse Source 
* changes:
  aconfig: remove support for --format=text
  aconfig: remove support for --format=verbose
  aconfig: remove support for --format=bool
This commit is contained in:
Mårten Kongstad
2023-12-21 07:03:38 +00:00
committed by Gerrit Code Review
parent fb5630b393 328d700b93
commit 85c9c5b81a
2 changed files with 3 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tools/aconfig/src/dump.rs
View File

@@ -36,17 +36,6 @@ impl TryFrom<&str> for DumpFormat {
// 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(),
)),
"verbose" => Ok(Self::Custom(
"{fully_qualified_name} [{container}]: {permission} + {state} ({trace:paths})"
.to_owned(),
)),
"bool" => Ok(Self::Custom("{fully_qualified_name}={state:bool}".to_owned())),
// custom format
_ => Ok(Self::Custom(value.to_owned())),
}
@@ -270,20 +259,6 @@ mod tests {
"{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"
);
assert_dump_parsed_flags_custom_format_contains!(
"verbose",
"com.android.aconfig.test.enabled_ro [system]: READ_ONLY + ENABLED (tests/test.aconfig, tests/first.values, tests/second.values)"
);
assert_dump_parsed_flags_custom_format_contains!(
"bool",
"com.android.aconfig.test.enabled_ro=true"
);
}
#[test]

4
tools/aconfig/src/main.rs
View File

@@ -114,7 +114,9 @@ fn cli() -> Command {
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")