ruff - enable and fix selected RUF rules (#7883)

Adding checks for #7505

[RUF005 -
collection-literal-concatenation](https://docs.astral.sh/ruff/rules/collection-literal-concatenation/)
[RUF015 -
unnecessary-iterable-allocation-for-first-element](https://docs.astral.sh/ruff/rules/unnecessary-iterable-allocation-for-first-element/)

This resolves #7505

---------

Co-authored-by: Pavol Juhas <juhas@google.com>

Author: joesho112358

cirq-core/cirq/_compat_test.py

@@ -584,44 +584,50 @@ def _type_repr_in_deprecated_module():
 
 # this is where the deprecation error should show where the deprecated usage
 # has occured, which is this file
-_deprecation_origin = ['_compat_test.py:']
+_deprecation_origin = '_compat_test.py:'
 
 # see cirq_compat_test_data/__init__.py for the setup code
 _fake_a_deprecation_msg = [
     f'{old_parent}.fake_a was used but is deprecated',
     f'Use {old_parent}.module_a instead',
-] + _deprecation_origin
+    _deprecation_origin,
+]
 
 # see cirq_compat_test_data/__init__.py for the setup code
 _fake_b_deprecation_msg = [
     f'{old_parent}.fake_b was used but is deprecated',
     f'Use {old_parent}.module_a.module_b instead',
-] + _deprecation_origin
+    _deprecation_origin,
+]
 
 # see cirq_compat_test_data/__init__.py for the setup code
 _fake_ab_deprecation_msg = [
     f'{old_parent}.module_a.fake_ab was used but is deprecated',
     f'Use {old_parent}.module_a.module_b instead',
-] + _deprecation_origin
+    _deprecation_origin,
+]
 
 # see cirq_compat_test_data/__init__.py for the setup code
 _fake_ops_deprecation_msg = [
     f'{old_parent}.fake_ops was used but is deprecated',
     'Use cirq.ops instead',
-] + _deprecation_origin
+    _deprecation_origin,
+]
 
 
 # see cirq_compat_test_data/__init__.py for the setup code
 _fake_numpy_deprecation_msg = [
     f'{old_parent}.fake_numpy was used but is deprecated',
     'Use numpy instead',
-] + _deprecation_origin
+    _deprecation_origin,
+]
 
 # see cirq_compat_test_data/__init__.py for the setup code
 _repeated_child_deprecation_msg = [
     f'{old_parent}.repeated_child was used but is deprecated',
     f'Use {old_parent}.repeated instead',
-] + _deprecation_origin
+    _deprecation_origin,
+]
 
 
 def _trace_unhandled_exceptions(*args, queue: multiprocessing.Queue, func: Callable):

cirq-core/cirq/circuits/circuit_test.py

@@ -344,6 +344,7 @@ def test_add_op_tree(circuit_cls) -> None:
     a = cirq.NamedQubit('a')
     b = cirq.NamedQubit('b')
 
+    # ruff: disable[RUF005]
     c = circuit_cls()
     assert c + [cirq.X(a), cirq.Y(b)] == circuit_cls([cirq.Moment([cirq.X(a), cirq.Y(b)])])
 
@@ -362,6 +363,7 @@ def test_radd_op_tree(circuit_cls, gate) -> None:
     a = cirq.NamedQubit('a')
     b = cirq.NamedQubit('b')
 
+    # ruff: disable[RUF005]
     c = circuit_cls()
     assert [gate(a), cirq.Y(b)] + c == circuit_cls([cirq.Moment([gate(a), cirq.Y(b)])])
 

cirq-core/cirq/circuits/moment.py

@@ -218,7 +218,7 @@ def with_operation(self, operation: cirq.Operation) -> cirq.Moment:
 
         # Use private variables to facilitate a quick copy.
         m = Moment(_flatten_contents=False)
-        m._operations = self._operations + (operation,)
+        m._operations = (*self._operations, operation)
         m._sorted_operations = None
         m._qubit_to_op = {**self._qubit_to_op, **dict.fromkeys(operation.qubits, operation)}
 

cirq-core/cirq/circuits/moment_test.py

@@ -516,6 +516,7 @@ def test_add() -> None:
     with pytest.raises(ValueError, match='Overlap'):
         _ = m1 + m2
 
+    # ruff: disable[RUF005]
     assert m1 + [[[[cirq.Y(b)]]]] == cirq.Moment(cirq.X(a), cirq.Y(b))
     assert m1 + [] == m1
     assert m1 + [] is m1

cirq-core/cirq/contrib/qasm_import/_lexer.py

@@ -49,7 +49,8 @@ def __init__(self):
         'ARROW',
         'EQ',
         'AND',
-    ] + list(reserved.values())
+        *reserved.values(),
+    ]
 
     def t_newline(self, t):
         r"""\n+"""

cirq-core/cirq/contrib/qasm_import/_parser.py

@@ -1125,9 +1125,7 @@ def p_if(self, p):
             for i, key in enumerate(carg):
                 v = (val >> i) & 1
                 conditions.append(sympy.Eq(sympy.Symbol(key), v))
-        p[0] = [
-            ops.ClassicallyControlledOperation(conditions=conditions, sub_operation=tuple(p[5])[0])
-        ]
+        p[0] = [ops.ClassicallyControlledOperation(conditions=conditions, sub_operation=next(p[5]))]
 
     def p_gate_params_multiple(self, p):
         """gate_params : ID ',' gate_params"""

cirq-core/cirq/contrib/qasm_import/_parser_test.py

@@ -2432,7 +2432,7 @@ def test_all_qelib_gates_unitary_equivalence(
         gate = cirq_gate
     expected = Circuit()
     expected.append(gate.on(*qubits))
-    imported = list(parsed_qasm.circuit.all_operations())[0].gate
+    imported = next(parsed_qasm.circuit.all_operations()).gate
     U_native = cirq.unitary(gate)
     U_import = cirq.unitary(imported)
     assert np.allclose(U_import, U_native, atol=1e-8)

cirq-core/cirq/contrib/quimb/mps_simulator.py

@@ -427,7 +427,7 @@ def apply_op(self, op: Any, axes: Sequence[int], prng: np.random.RandomState):
 
                 T = U @ self._M[n] @ self._M[p]
 
-                left_inds = tuple(set(T.inds) & set(self._M[n].inds)) + (new_inds[0],)
+                left_inds = (*set(T.inds).intersection(self._M[n].inds), new_inds[0])
                 X, Y = T.split(
                     left_inds,
                     method=self._simulation_options.method,

cirq-core/cirq/contrib/shuffle_circuits/shuffle_circuits_with_readout_benchmarking_test.py

@@ -380,7 +380,7 @@ def test_circuits_with_readout_benchmarking_no_qubits_arg_empty_rng(mode: str) -
 
     # When qubits is None, all qubits from input circuits are benchmarked as one group.
     assert len(readout_calibration_results) == 1
-    qlist, result = list(readout_calibration_results.items())[0]
+    qlist, result = next(iter(readout_calibration_results.items()))
     assert isinstance(qlist, tuple)
     assert set(qlist) == set(qubits)
     assert isinstance(result, SingleQubitReadoutCalibrationResult)
@@ -412,7 +412,7 @@ def test_deprecated_run_shuffled_with_readout_benchmarking() -> None:
             qubits=qubits,
         )
     assert len(measurements_seed) == len(input_circuits)
-    qlist, result = list(results_seed.items())[0]
+    qlist, result = next(iter(results_seed.items()))
     assert tuple(qubits) == qlist
     for error in result.zero_state_errors.values():
         assert 0.08 < error < 0.12
@@ -430,7 +430,7 @@ def test_deprecated_run_shuffled_with_readout_benchmarking() -> None:
             readout_repetitions=readout_repetitions,
             qubits=None,
         )
-    qlist_none, _ = list(results_none.items())[0]
+    qlist_none = next(iter(results_none.keys()))
     assert set(qlist_none) == set(qubits)
 
     # Test circuit_repetitions must be > 0

cirq-core/cirq/devices/grid_qubit_test.py

@@ -242,6 +242,7 @@ def test_diagram() -> None:
 
 
 def test_addition_subtraction() -> None:
+    # ruff: disable[RUF005]
     # GridQubits
     assert cirq.GridQubit(1, 2) + (2, 5) == cirq.GridQubit(3, 7)
     assert cirq.GridQubit(1, 2) + (0, 0) == cirq.GridQubit(1, 2)
@@ -311,6 +312,7 @@ def test_addition_subtraction_numpy_array(dtype) -> None:
 
 
 def test_unsupported_add() -> None:
+    # ruff: disable[RUF005]
     with pytest.raises(TypeError, match='1'):
         _ = cirq.GridQubit(1, 1) + 1  # type: ignore[operator]
     with pytest.raises(TypeError, match='(1,)'):