Skip to content

Commit

Permalink
Fix name collision in program proto (#3949)
Browse files Browse the repository at this point in the history
Fix name collision in program proto around `Entry`-s (causes a name collision in the discovery API generation in g3).
  • Loading branch information
balopat committed Mar 22, 2021
1 parent 985b411 commit f7ccb4c
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 74 deletions.
12 changes: 6 additions & 6 deletions cirq/google/api/v2/program.proto
Original file line number Diff line number Diff line change
Expand Up @@ -257,13 +257,13 @@ message RepetitionSpecification {
// qubits a and b.
message QubitMapping {
// Indicates that qubit "key" should be replaced with "value".
message Entry {
message QubitEntry {
Qubit key = 1;
Qubit value = 2;
}

// A list of qubit mappings to apply.
repeated Entry entries = 1;
repeated QubitEntry entries = 1;
}

// A key for matching a measurement event to its results.
Expand All @@ -276,25 +276,25 @@ message MeasurementKey {
// swap measurement keys a and b.
message MeasurementKeyMapping {
// Indicates that measurement key "key" should be replaced with "value".
message Entry {
message MeasurementKeyEntry {
MeasurementKey key = 1;
MeasurementKey value = 2;
}

// A list of measurement key mappings to apply.
repeated Entry entries = 1;
repeated MeasurementKeyEntry entries = 1;
}

// A mapping of args from one value to another. All mappings are applied
// simultaneously and independently; for example, [(a, b), (b, a)] will swap
// args a and b.
message ArgMapping {
// Indicates that arg "key" should be replaced with "value".
message Entry {
message ArgEntry {
Arg key = 1;
Arg value = 2;
}

// A list of arg mappings to apply.
repeated Entry entries = 1;
repeated ArgEntry entries = 1;
}

0 comments on commit f7ccb4c

Please sign in to comment.