Rollup merge of rust-lang#112499 - tgross35:py-ruff-fixes, r=Mark-Simulacrum

Fix python linting errors These were flagged by `ruff`, run using the config in rust-lang#112482

Author: compiler-errors

compiler/rustc_codegen_gcc/tools/generate_intrinsics.py

@@ -3,7 +3,6 @@
 import re
 import sys
 import subprocess
-from os import walk
 
 
 def run_command(command, cwd=None):
@@ -180,7 +179,7 @@ def update_intrinsics(llvm_path, llvmint, llvmint2):
  intrinsics[arch].sort(key=lambda x: (x[0], x[2]))
  out.write(' // {}\n'.format(arch))
  for entry in intrinsics[arch]:
- if entry[2] == True: # if it is a duplicate
+ if entry[2] is True: # if it is a duplicate
  out.write(' // [DUPLICATE]: "{}" => "{}",\n'.format(entry[0], entry[1]))
  elif "_round_mask" in entry[1]:
  out.write(' // [INVALID CONVERSION]: "{}" => "{}",\n'.format(entry[0], entry[1]))

library/core/src/unicode/printable.py

@@ -119,7 +119,7 @@ def print_singletons(uppers, lowers, uppersname, lowersname):
  print("#[rustfmt::skip]")
  print("const {}: &[u8] = &[".format(lowersname))
  for i in range(0, len(lowers), 8):
- print(" {}".format(" ".join("{:#04x},".format(l) for l in lowers[i:i+8])))
+ print(" {}".format(" ".join("{:#04x},".format(x) for x in lowers[i:i+8])))
  print("];")
 
 def print_normal(normal, normalname):

src/bootstrap/bootstrap.py

@@ -620,7 +620,7 @@ def get_answer():
  # The latter one does not exist on NixOS when using tmpfs as root.
  try:
  with open("/etc/os-release", "r") as f:
- if not any(l.strip() in ("ID=nixos", "ID='nixos'", 'ID="nixos"') for l in f):
+ if not any(ln.strip() in ("ID=nixos", "ID='nixos'", 'ID="nixos"') for ln in f):
  return False
  except FileNotFoundError:
  return False
@@ -872,7 +872,7 @@ def build_bootstrap(self, color, warnings, verbose_count):
  }
  for var_name, toml_key in var_data.items():
  toml_val = self.get_toml(toml_key, build_section)
- if toml_val != None:
+ if toml_val is not None:
  env["{}_{}".format(var_name, host_triple_sanitized)] = toml_val
 
  # preserve existing RUSTFLAGS

src/bootstrap/configure.py

@@ -9,7 +9,7 @@
 rust_dir = os.path.dirname(rust_dir)
 rust_dir = os.path.dirname(rust_dir)
 sys.path.append(os.path.join(rust_dir, "src", "bootstrap"))
-import bootstrap
+import bootstrap # noqa: E402
 
 
 class Option(object):
@@ -319,7 +319,7 @@ def apply_args(known_args, option_checking, config):
  for key in known_args:
  # The `set` option is special and can be passed a bunch of times
  if key == 'set':
- for option, value in known_args[key]:
+ for _option, value in known_args[key]:
  keyval = value.split('=', 1)
  if len(keyval) == 1 or keyval[1] == "true":
  value = True
@@ -401,7 +401,7 @@ def parse_example_config(known_args, config):
  top_level_keys = []
 
  for line in open(rust_dir + '/config.example.toml').read().split("\n"):
- if cur_section == None:
+ if cur_section is None:
  if line.count('=') == 1:
  top_level_key = line.split('=')[0]
  top_level_key = top_level_key.strip(' #')
@@ -523,8 +523,8 @@ def write_uncommented(target, f):
  block.append(line)
  if len(line) == 0:
  if not is_comment:
- for l in block:
- f.write(l + "\n")
+ for ln in block:
+ f.write(ln + "\n")
  block = []
  is_comment = True
  continue

src/ci/cpu-usage-over-time.py

@@ -2,6 +2,14 @@
 # Simpler reimplementation of Android's sdkmanager
 # Extra features of this implementation are pinning and mirroring
 
+import argparse
+import hashlib
+import os
+import subprocess
+import tempfile
+import urllib.request
+import xml.etree.ElementTree as ET
+
 # These URLs are the Google repositories containing the list of available
 # packages and their versions. The list has been generated by listing the URLs
 # fetched while executing `tools/bin/sdkmanager --list`
@@ -27,15 +35,6 @@
 MIRROR_BUCKET_REGION = "us-west-1"
 MIRROR_BASE_DIR = "rustc/android/"
 
-import argparse
-import hashlib
-import os
-import subprocess
-import sys
-import tempfile
-import urllib.request
-import xml.etree.ElementTree as ET
-
 class Package:
  def __init__(self, path, url, sha1, deps=None):
  if deps is None:

src/ci/docker/host-x86_64/test-various/uefi_qemu_test/run.py

@@ -519,8 +519,8 @@ def log(msg):
  env_vars += f'\n "{var_name}={var_value}",'
 
  # Default to no backtrace for test suite
- if os.getenv("RUST_BACKTRACE") == None:
- env_vars += f'\n "RUST_BACKTRACE=0",'
+ if os.getenv("RUST_BACKTRACE") is None:
+ env_vars += '\n "RUST_BACKTRACE=0",'
 
  # Use /tmp as the test temporary directory
  env_vars += f'\n "RUST_TEST_TMPDIR=/tmp",'

src/ci/docker/scripts/android-sdk-manager.py

@@ -440,7 +440,7 @@ def retry_action(action, name: str, max_fails: int = 5):
  try:
  action()
  return
- except:
+ except BaseException: # also catch ctrl+c/sysexit
  LOGGER.error(f"Action `{name}` has failed\n{traceback.format_exc()}")
 
  raise Exception(f"Action `{name}` has failed after {max_fails} attempts")
@@ -818,7 +818,7 @@ def extract_dist_dir(name: str) -> Path:
  # Extract rustc, libstd, cargo and src archives to create the optimized sysroot
  rustc_dir = extract_dist_dir(f"rustc-nightly-{PGO_HOST}") / "rustc"
  libstd_dir = extract_dist_dir(f"rust-std-nightly-{PGO_HOST}") / f"rust-std-{PGO_HOST}"
- cargo_dir = extract_dist_dir(f"cargo-nightly-{PGO_HOST}") / f"cargo"
+ cargo_dir = extract_dist_dir(f"cargo-nightly-{PGO_HOST}") / "cargo"
  extracted_src_dir = extract_dist_dir("rust-src-nightly") / "rust-src"
 
  # We need to manually copy libstd to the extracted rustc sysroot

src/ci/docker/scripts/fuchsia-test-runner.py

@@ -14,8 +14,7 @@
 available here: <https://github.com/fastfloat/fast_float/blob/main/script/table_generation.py>.
 """
 from __future__ import print_function
-from math import ceil, floor, log, log2
-from fractions import Fraction
+from math import ceil, floor, log
 from collections import deque
 
 HEADER = """
@@ -97,7 +96,6 @@ def print_proper_powers(min_exp, max_exp, bias):
  print('#[rustfmt::skip]')
  typ = '[(u64, u64); N_POWERS_OF_FIVE]'
  print('pub static POWER_OF_FIVE_128: {} = ['.format(typ))
- lo_mask = (1 << 64) - 1
  for c, exp in powers:
  hi = '0x{:x}'.format(c // (1 << 64))
  lo = '0x{:x}'.format(c % (1 << 64))