Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 328d700b authored by Mårten Kongstad's avatar Mårten Kongstad
Browse files

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
parent ce3a299f
Loading
Loading
Loading
Loading
+0 −12
Original line number Diff line number Diff line
@@ -36,12 +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(),
            )),

            // custom format
            _ => Ok(Self::Custom(value.to_owned())),
        }
@@ -265,12 +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"
        );
    }

    #[test]
+3 −1
Original line number Diff line number Diff line
@@ -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")