[clang] [clang-format][NFC] Use `prog` in clang-format-diff.py (PR #74399)

Owen Pan via cfe-commits cfe-commits at lists.llvm.org
Tue Dec 5 00:52:45 PST 2023


https://github.com/owenca updated https://github.com/llvm/llvm-project/pull/74399

>From ee039e7c50751fabdbaadae73a0a09bc905620f2 Mon Sep 17 00:00:00 2001
From: Owen Pan <owenpiano at gmail.com>
Date: Mon, 4 Dec 2023 17:33:47 -0800
Subject: [PATCH 1/3] [clang-format][NFC] Use `prog` in clang-format-diff.py

This is a minor improvement to #73491.
---
 clang/tools/clang-format/clang-format-diff.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/clang/tools/clang-format/clang-format-diff.py b/clang/tools/clang-format/clang-format-diff.py
index b25ee8f433751..946e28163420d 100755
--- a/clang/tools/clang-format/clang-format-diff.py
+++ b/clang/tools/clang-format/clang-format-diff.py
@@ -37,9 +37,8 @@
 
 
 def main():
-    basename = os.path.basename(sys.argv[0])
     parser = argparse.ArgumentParser(
-        description=__doc__.format(clang_format_diff=basename),
+        description=__doc__.format(clang_format_diff='%(prog)s'),
         formatter_class=argparse.RawDescriptionHelpFormatter,
     )
     parser.add_argument(

>From d8b2dab602b41deda70abd0f219ca88d5fd69c36 Mon Sep 17 00:00:00 2001
From: Owen Pan <owenpiano at gmail.com>
Date: Mon, 4 Dec 2023 17:41:58 -0800
Subject: [PATCH 2/3] Use double quotes instead.

---
 clang/tools/clang-format/clang-format-diff.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clang/tools/clang-format/clang-format-diff.py b/clang/tools/clang-format/clang-format-diff.py
index 946e28163420d..9f3538608aaba 100755
--- a/clang/tools/clang-format/clang-format-diff.py
+++ b/clang/tools/clang-format/clang-format-diff.py
@@ -38,7 +38,7 @@
 
 def main():
     parser = argparse.ArgumentParser(
-        description=__doc__.format(clang_format_diff='%(prog)s'),
+        description=__doc__.format(clang_format_diff="%(prog)s"),
         formatter_class=argparse.RawDescriptionHelpFormatter,
     )
     parser.add_argument(

>From 6ff8c2870bfb093cc5a02d0f6caa5c869cf5ec29 Mon Sep 17 00:00:00 2001
From: Owen Pan <owenpiano at gmail.com>
Date: Tue, 5 Dec 2023 00:51:16 -0800
Subject: [PATCH 3/3] Remove now unneeded `import os`.

---
 clang/tools/clang-format/clang-format-diff.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/clang/tools/clang-format/clang-format-diff.py b/clang/tools/clang-format/clang-format-diff.py
index 9f3538608aaba..0a2c24743678d 100755
--- a/clang/tools/clang-format/clang-format-diff.py
+++ b/clang/tools/clang-format/clang-format-diff.py
@@ -25,7 +25,6 @@
 
 import argparse
 import difflib
-import os
 import re
 import subprocess
 import sys



More information about the cfe-commits mailing list