Re: [PATCH 04/28] tests/qapi-schema: Belatedly update comment on alternate clash

[John Snow]

On 3/23/21 5:40 AM, Markus Armbruster wrote:
> Commit 0426d53c65 "qapi: Simplify visiting of alternate types"
> eliminated the implicit alternate enum, but neglected to update a
> comment about it in a test.  Do that now.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: John Snow <jsnow@redhat.com>

> ---
>   tests/qapi-schema/alternate-clash.err  | 2 +-
>   tests/qapi-schema/alternate-clash.json | 5 +----
>   2 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/tests/qapi-schema/alternate-clash.err 
> b/tests/qapi-schema/alternate-clash.err
> index f58b977f7b..0fe02f2c99 100644
> --- a/tests/qapi-schema/alternate-clash.err
> +++ b/tests/qapi-schema/alternate-clash.err
> @@ -1,2 +1,2 @@
>   alternate-clash.json: In alternate 'Alt1':
> -alternate-clash.json:7: branch 'a_b' collides with branch 'a-b'
> +alternate-clash.json:4: branch 'a_b' collides with branch 'a-b'
> diff --git a/tests/qapi-schema/alternate-clash.json 
> b/tests/qapi-schema/alternate-clash.json
> index 9a59b88ced..039c4be658 100644
> --- a/tests/qapi-schema/alternate-clash.json
> +++ b/tests/qapi-schema/alternate-clash.json
> @@ -1,8 +1,5 @@
>   # Alternate branch name collision
>   # Reject an alternate that would result in a collision in generated C
> -# names (this would try to generate two enum values 'ALT1_KIND_A_B').
> -# TODO: In the future, if alternates are simplified to not generate
> -# the implicit Alt1Kind enum, we would still have a collision with the
> -# resulting C union trying to have two members named 'a_b'.
> +# names (this would try to generate two union members named 'a_b').
>   { 'alternate': 'Alt1',
>     'data': { 'a-b': 'bool', 'a_b': 'int' } }