[PATCH ndctl 0/2] misc meson.build and clang-format updates

[PATCH ndctl 0/2] misc meson.build and clang-format updates

[Vishal Verma]

Patch 1 adds a .clang-format option to reformat macros for aligning

Patch 2 squelches a warning from a meson update.

Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Alison Schofield <alison.schofield@intel.com>
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>

---
Vishal Verma (2):
      clang-format: Align consecutive macros and #defines
      meson.build: add a check argument to run_command

 .clang-format | 1 +
 meson.build   | 1 +
 2 files changed, 2 insertions(+)
---
base-commit: 3591a1bea2bd90349963b02aeb9064dc3fbd3d83
change-id: 20221206-vv-misc-12ffd1061e0a

Best regards,
-- 
Vishal Verma <vishal.l.verma@intel.com>

[PATCH ndctl 1/2] clang-format: Align consecutive macros and #defines

[Vishal Verma]

Add AlignConsecutiveMacros: true so that blocks of consecutive #defines
can be neatly aligned.

Cc: Dan Williams <dan.j.williams@intel.com>
Reported-by: Alison Schofield <alison.schofield@intel.com>
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
---
 .clang-format | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.clang-format b/.clang-format
index b6169e1..9ea49bf 100644
--- a/.clang-format
+++ b/.clang-format
@@ -13,6 +13,7 @@ AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
+AlignConsecutiveMacros: true
 #AlignEscapedNewlines: Left # Unknown to clang-format-4.0
 AlignOperands: true
 AlignTrailingComments: false

-- 
2.38.1

Re: [PATCH ndctl 1/2] clang-format: Align consecutive macros and #defines

[Alison Schofield]

On Tue, Dec 06, 2022 at 03:46:23PM -0700, Vishal Verma wrote:
> Add AlignConsecutiveMacros: true so that blocks of consecutive #defines
> can be neatly aligned.
> 
> Cc: Dan Williams <dan.j.williams@intel.com>
> Reported-by: Alison Schofield <alison.schofield@intel.com>
> Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
> ---

Thanks Vishal!
Reviewed-by: Alison Schofield <alison.schofield@intel.com>


>  .clang-format | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.clang-format b/.clang-format
> index b6169e1..9ea49bf 100644
> --- a/.clang-format
> +++ b/.clang-format
> @@ -13,6 +13,7 @@ AccessModifierOffset: -4
>  AlignAfterOpenBracket: Align
>  AlignConsecutiveAssignments: false
>  AlignConsecutiveDeclarations: false
> +AlignConsecutiveMacros: true
>  #AlignEscapedNewlines: Left # Unknown to clang-format-4.0
>  AlignOperands: true
>  AlignTrailingComments: false
> 
> -- 
> 2.38.1

[PATCH ndctl 2/2] meson.build: add a check argument to run_command

[Vishal Verma]

Meson has started to warn about:

  WARNING: You should add the boolean check kwarg to the run_command call.
         It currently defaults to false,
         but it will default to true in future releases of meson.
         See also: https://github.com/mesonbuild/meson/issues/9300

There is one instance of run_command() in the top-level meson.build
which elides the explicit check argument. Since we don't care about the
result of clean_config.sh (if any config.h are found they will be
cleaned, and if none are found, we're fine), add a 'check: false'
argument to this and squelch the warning.

Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
---
 meson.build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meson.build b/meson.build
index 20a646d..33ed0ed 100644
--- a/meson.build
+++ b/meson.build
@@ -89,6 +89,7 @@ env = find_program('env')
 if git.found()
   run_command('clean_config.sh',
     env : 'GIT_DIR=@0@/.git'.format(project_source_root),
+    check : false,
   )
 endif
 

-- 
2.38.1

RE: [PATCH ndctl 2/2] meson.build: add a check argument to run_command

[Dan Williams]

Vishal Verma wrote:
> Meson has started to warn about:
> 
>   WARNING: You should add the boolean check kwarg to the run_command call.
>          It currently defaults to false,
>          but it will default to true in future releases of meson.
>          See also: https://github.com/mesonbuild/meson/issues/9300
> 
> There is one instance of run_command() in the top-level meson.build
> which elides the explicit check argument. Since we don't care about the
> result of clean_config.sh (if any config.h are found they will be
> cleaned, and if none are found, we're fine), add a 'check: false'
> argument to this and squelch the warning.

Looks good to me:

Reviewed-by: Dan Williams <dan.j.williams@intel.com>