Revert "Merge branch 'feature/clippy' into 'master'"

This reverts merge request !16998
This commit is contained in:
Roland Dobai
2022-06-29 16:46:47 +08:00
parent 9ee26516a7
commit 8dddb8b596
11 changed files with 79 additions and 283 deletions

View File

@@ -18,7 +18,7 @@ from idf_py_actions.constants import GENERATORS, PREVIEW_TARGETS, SUPPORTED_TARG
from idf_py_actions.errors import FatalError
from idf_py_actions.global_options import global_options
from idf_py_actions.tools import (PropertyDict, TargetChoice, ensure_build_directory, get_target, idf_version,
merge_action_lists, print_hints, realpath, run_target)
merge_action_lists, realpath, run_target)
def action_extensions(base_actions: Dict, project_path: str) -> Any:
@@ -29,9 +29,8 @@ def action_extensions(base_actions: Dict, project_path: str) -> Any:
Calls ensure_build_directory() which will run cmake to generate a build
directory (with the specified generator) as needed.
"""
hints = not args.no_hints
ensure_build_directory(args, ctx.info_name)
run_target(target_name, args, force_progression=GENERATORS[args.generator].get('force_progression', False), hints=hints)
run_target(target_name, args)
def size_target(target_name: str, ctx: Context, args: PropertyDict) -> None:
"""
@@ -41,13 +40,11 @@ def action_extensions(base_actions: Dict, project_path: str) -> Any:
"""
def tool_error_handler(e: int, stdout: str, stderr: str) -> None:
print_hints(stdout, stderr)
def tool_error_handler(e: int) -> None:
pass
hints = not args.no_hints
ensure_build_directory(args, ctx.info_name)
run_target('all', args, force_progression=GENERATORS[args.generator].get('force_progression', False),
custom_error_handler=tool_error_handler, hints=hints)
run_target('all', args, custom_error_handler=tool_error_handler)
run_target(target_name, args)
def list_build_system_targets(target_name: str, ctx: Context, args: PropertyDict) -> None:
@@ -64,7 +61,6 @@ def action_extensions(base_actions: Dict, project_path: str) -> Any:
# This encoding step is required only in Python 2.
style = style.encode(sys.getfilesystemencoding() or 'utf-8')
os.environ['MENUCONFIG_STYLE'] = style
args.no_hints = True
build_target(target_name, ctx, args)
def fallback_target(target_name: str, ctx: Context, args: PropertyDict) -> None:
@@ -308,12 +304,6 @@ def action_extensions(base_actions: Dict, project_path: str) -> Any:
'hidden': True,
'default': False,
},
{
'names': ['--no-hints'],
'help': 'Disable hints on how to resolve errors and logging.',
'is_flag': True,
'default': False
}
],
'global_action_callbacks': [validate_root_options],
}