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

Commit e305cd45 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "PDL: run the expected code through ‘rustfmt’ as well" am: 4a1bb71f 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2123492



Change-Id: I6adf6eaf53a910c8ddf46bf68c18909a75c18ce2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f258f5d0 4a1bb71f

tools/pdl/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -49,6 +49,5 @@ rust_test_host { 
    ],

    data: [

        ":rustfmt",

        "rustfmt.toml",

    ],

}

tools/pdl/rustfmt.toml

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../../rustfmt.toml
 
 No newline at end of file

tools/pdl/src/generator.rs

+4 −4
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ mod tests { 
    fn test_generate_preamble() {

        let actual_code = generate_preamble(Path::new("some/path/foo.pdl")).unwrap();

        let expected_code = include_str!("../test/generated/preamble.rs");

        assert_eq_with_diff(&rustfmt(&actual_code), expected_code);

        assert_eq_with_diff(&rustfmt(&actual_code), &rustfmt(expected_code));

    }



    #[test]
@@ -522,7 +522,7 @@ mod tests { 
        let decl = &grammar.declarations[0];

        let actual_code = generate_decl(&grammar, &packets, &children, decl).unwrap();

        let expected_code = include_str!("../test/generated/packet_decl_empty.rs");

        assert_eq_with_diff(&rustfmt(&actual_code), expected_code);

        assert_eq_with_diff(&rustfmt(&actual_code), &rustfmt(expected_code));

    }



    #[test]
@@ -542,7 +542,7 @@ mod tests { 
        let decl = &grammar.declarations[0];

        let actual_code = generate_decl(&grammar, &packets, &children, decl).unwrap();

        let expected_code = include_str!("../test/generated/packet_decl_simple_little_endian.rs");

        assert_eq_with_diff(&rustfmt(&actual_code), expected_code);

        assert_eq_with_diff(&rustfmt(&actual_code), &rustfmt(expected_code));

    }



    #[test]
@@ -562,6 +562,6 @@ mod tests { 
        let decl = &grammar.declarations[0];

        let actual_code = generate_decl(&grammar, &packets, &children, decl).unwrap();

        let expected_code = include_str!("../test/generated/packet_decl_simple_big_endian.rs");

        assert_eq_with_diff(&rustfmt(&actual_code), expected_code);

        assert_eq_with_diff(&rustfmt(&actual_code), &rustfmt(expected_code));

    }

}