[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/29] tests/qapi-schema: Belatedly update comment on alternate cl
From: |
Markus Armbruster |
Subject: |
[PULL 04/29] tests/qapi-schema: Belatedly update comment on alternate clash |
Date: |
Tue, 23 Mar 2021 22:56:33 +0100 |
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>
Message-Id: <20210323094025.3569441-5-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' } }
--
2.26.3
- [PULL 00/29] QAPI patches patches for 2021-03-23, Markus Armbruster, 2021/03/23
- [PULL 01/29] qapi/pragma: Tidy up after removal of deprecated commands, Markus Armbruster, 2021/03/23
- [PULL 07/29] qapi: Fix to reject optional members with reserved names, Markus Armbruster, 2021/03/23
- [PULL 06/29] tests/qapi-schema: Tweak to demonstrate buggy member name check, Markus Armbruster, 2021/03/23
- [PULL 05/29] tests/qapi-schema: Drop TODO comment on simple unions, Markus Armbruster, 2021/03/23
- [PULL 03/29] tests/qapi-schema: Rework comments on longhand member definitions, Markus Armbruster, 2021/03/23
- [PULL 02/29] tests/qapi-schema: Drop redundant flat-union-inline test, Markus Armbruster, 2021/03/23
- [PULL 04/29] tests/qapi-schema: Belatedly update comment on alternate clash,
Markus Armbruster <=
- [PULL 18/29] tests/qapi-schema: Rename returns-whitelist to returns-bad-type, Markus Armbruster, 2021/03/23
- [PULL 14/29] qapi: Enforce type naming rules, Markus Armbruster, 2021/03/23
- [PULL 15/29] tests/qapi-schema: Rename redefined-builtin to redefined-predefined, Markus Armbruster, 2021/03/23
- [PULL 23/29] qapi: Enforce feature naming rules, Markus Armbruster, 2021/03/23
- [PULL 21/29] tests-qmp-cmds: Drop unused and incorrect qmp_TestIfCmd(), Markus Armbruster, 2021/03/23
- [PULL 12/29] qapi: Consistently permit any case in downstream prefixes, Markus Armbruster, 2021/03/23
- [PULL 16/29] qapi: Factor out QAPISchemaParser._check_pragma_list_of_str(), Markus Armbruster, 2021/03/23
- [PULL 28/29] qapi: Enforce union and alternate branch naming rules, Markus Armbruster, 2021/03/23
- [PULL 17/29] tests/qapi-schema: Rename pragma-*-crap to pragma-value-not-*, Markus Armbruster, 2021/03/23
- [PULL 09/29] qapi: Lift enum-specific code out of check_name_str(), Markus Armbruster, 2021/03/23