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

Commit 85c9c5b8 authored by Mårten Kongstad's avatar Mårten Kongstad Committed by Gerrit Code Review
Browse files

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

* changes:
  aconfig: remove support for --format=text
  aconfig: remove support for --format=verbose
  aconfig: remove support for --format=bool
parents fb5630b3 328d700b

tools/aconfig/src/dump.rs

+0 −25
Original line number Diff line number Diff line
@@ -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]

tools/aconfig/src/main.rs

+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")