Skip to content

Commit

Permalink
Create documentation for Starlark code with stardoc
Browse files Browse the repository at this point in the history
We want a single source of truth and less work by maintaining
the docstring as well as the README.
  • Loading branch information
martis42 committed Aug 4, 2024
1 parent 0ce4f7b commit 1488605
Show file tree
Hide file tree
Showing 14 changed files with 231 additions and 59 deletions.
7 changes: 7 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
define: &generated_doc_files "^docs/(cc_info_mapping|dwyu_aspect).md"

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
Expand All @@ -11,15 +13,19 @@ repos:
- id: check-json
# Code style
- id: end-of-file-fixer
exclude: *generated_doc_files
- id: trailing-whitespace
# Python code quality
- id: debug-statements

- repo: https://github.com/executablebooks/mdformat
rev: 0.7.17
hooks:
- id: mdformat
exclude: *generated_doc_files
additional_dependencies:
- mdformat-gfm

- repo: https://github.com/keith/pre-commit-buildifier
rev: 7.1.2
hooks:
Expand All @@ -30,6 +36,7 @@ repos:
"--diff_command='diff'",
"--warnings=-module-docstring,-function-docstring,-function-docstring-header,-print"
]

- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.5.5
Expand Down
2 changes: 2 additions & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ use_repo(non_module_dependencies, "dwyu_pcpp")

# Keep in sync with third_party/dependencies.bzl
bazel_dep(name = "bazel_skylib", version = "1.7.1", dev_dependency = True)
bazel_dep(name = "aspect_bazel_lib", version = "2.7.9", dev_dependency = True)
bazel_dep(name = "stardoc", version = "0.7.0", dev_dependency = True)

python = use_extension(
"@rules_python//python/extensions:python.bzl",
Expand Down
37 changes: 0 additions & 37 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
- [Get a specific commit](#get-a-specific-commit)
- [Use DWYU](#use-dwyu)
- [Configuring DWYU](#configuring-dwyu)
- [Custom header ignore list](#custom-header-ignore-list)
- [Skipping Targets](#skipping-targets)
- [Recursion](#recursion)
- [Implementation_deps](#Implementation_deps)
- [Target mapping](#target-mapping)
- [Verbosity](#verbosity)
Expand Down Expand Up @@ -123,28 +121,6 @@ This is demonstrated in the [rule_using_dwyu example](/examples/rule_using_dwyu)

# Configuring DWYU

## Custom header ignore list

By default, DWYU ignores all header from the standard library when comparing include statements to the dependencies.
This list of headers can be seen in [std_header.py](src/analyze_includes/std_header.py).

You can exclude a custom set of header files by providing a config file in json format to the aspect:

```starlark
your_aspect = dwyu_aspect_factory(ignored_includes = "//<your_config_file>.json")
```

The config file can contain these fields which should be lists of strings.
All fields are optional:

| Field | Description |
| ---------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `ignore_include_paths` | List of include paths which are ignored by the analysis. Setting this **disables ignoring the standard library include paths**. |
| `extra_ignore_include_paths` | List of include paths which are ignored by the analysis. If `ignore_include_paths` is specified as well, both list are combined. If `ignore_include_paths` is not set, the default list of standard library headers is extended. |
| `ignore_include_patterns` | List of patterns for include paths which are ignored by the analysis. Patterns have to be compatible to Python [regex syntax](https://docs.python.org/3/library/re.html#regular-expression-syntax). The [match](https://docs.python.org/3/library/re.html#re.match) function is used to process the patterns. |

This is demonstrated in the [ignoring_includes example](/examples/ignoring_includes).

## Skipping targets

If you want the DWYU aspect to skip certain targets and negative target patterns are not an option you can do so by setting the `no-dwyu` tag on those.
Expand All @@ -165,19 +141,6 @@ your_aspect = dwyu_aspect_factory(skip_external_targets = True)

Both options are demonstrated in the [skipping_targets example](/examples/skipping_targets).

## Recursion

By default, DWYU analyzes only the target it is being applied to.

You can also activate recursive analysis.
Meaning the aspect analyzes recursively all dependencies of the target it is being applied to:

```starlark
your_aspect = dwyu_aspect_factory(recursive = True)
```

This is demonstrated in the [recursion example](/examples/recursion).

## Implementation_deps

Bazel offers the experimental feature [`implementation_deps`](https://bazel.build/reference/be/c-cpp#cc_library.implementation_deps) to distinguish between public (aka interface) and private (aka implementation) dependencies for `cc_library`.
Expand Down
13 changes: 13 additions & 0 deletions docs/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
load("@aspect_bazel_lib//lib:docs.bzl", "stardoc_with_diff_test", "update_docs")

stardoc_with_diff_test(
name = "cc_info_mapping",
bzl_library_target = "//src/cc_info_mapping:cc_info_mapping",
)

stardoc_with_diff_test(
name = "dwyu_aspect",
bzl_library_target = "//src/aspect:factory",
)

update_docs()
52 changes: 52 additions & 0 deletions docs/cc_info_mapping.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<!-- Generated with Stardoc: http://skydoc.bazel.build -->

# Motivation

Sometimes users don't want to follow the DWYU rules for all targets or have to work with external dependencies not following the DWYU principles.
While one can completely exclude targets from the DWYU analysis (e.g. via tags), one might not want to disable DWYU completely, but define custom rules for specific dependencies.
One can do so by defining exceptions where includes can be provided by selected transitive dependencies instead of direct dependencies.
In other words, one can virtually change which header files are treated as being available from direct dependencies.

One example use case for this are unit tests based on gtest.
Following strictly the DWYU principles each test using a gtest header should depend both on the gtest library and the gtest main:
```starlark
cc_test(
name = "my_test",
srcs = ["my_test.cc"],
deps = [
"@com_google_googletest//:gtest",
"@com_google_googletest//:gtest_main",
],
)
```
This can be considered superfluous noise without a significant benefit.
The mapping feature described here allows defining that `@com_google_googletest//:gtest_main` offers the header files from `@com_google_googletest//:gtest`.
Then a test can specify only the dependency to `@com_google_googletest//:gtest_main` without DWYU raising an error while analysing the test.

<a id="dwyu_make_cc_info_mapping"></a>

## dwyu_make_cc_info_mapping

<pre>
load("@depend_on_what_you_use//src/cc_info_mapping:cc_info_mapping.bzl", "dwyu_make_cc_info_mapping")

dwyu_make_cc_info_mapping(<a href="#dwyu_make_cc_info_mapping-name">name</a>, <a href="#dwyu_make_cc_info_mapping-mapping">mapping</a>)
</pre>

Map include paths available from one or several targets to another target.

Create a mapping allowing treating targets as if they themselves would offer header files, which in fact are coming from their dependencies.
This enables the DWYU analysis to skip over some usage of headers provided by transitive dependencies without raising an error.

Using this rule and the various mapping techniques is demonstrated in the [target_mapping example](/examples/target_mapping).


**PARAMETERS**


| Name | Description | Default Value |
| :------------- | :------------- | :------------- |
| <a id="dwyu_make_cc_info_mapping-name"></a>name | Unique name for this target. Will be the prefix for all private intermediate targets. | none |
| <a id="dwyu_make_cc_info_mapping-mapping"></a>mapping | Dictionary containing various targets and how they should be mapped. Possible mappings are:<br> - An explicit list of targets which are mapped to the main target. Be careful only to choose targets which are dependencies of the main target! <br> - The `MAP_DIRECT_DEPS` token which tells the rule to map all direct dependencies to the main target. <br> - The `MAP_TRANSITIVE_DEPS` token which tells the rule to map recursively all transitive dependencies to the main target. | none |


35 changes: 35 additions & 0 deletions docs/dwyu_aspect.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<!-- Generated with Stardoc: http://skydoc.bazel.build -->



<a id="dwyu_aspect_factory"></a>

## dwyu_aspect_factory

<pre>
load("@depend_on_what_you_use//src/aspect:factory.bzl", "dwyu_aspect_factory")

dwyu_aspect_factory(<a href="#dwyu_aspect_factory-ignored_includes">ignored_includes</a>, <a href="#dwyu_aspect_factory-recursive">recursive</a>, <a href="#dwyu_aspect_factory-skip_external_targets">skip_external_targets</a>, <a href="#dwyu_aspect_factory-skipped_tags">skipped_tags</a>,
<a href="#dwyu_aspect_factory-target_mapping">target_mapping</a>, <a href="#dwyu_aspect_factory-use_implementation_deps">use_implementation_deps</a>, <a href="#dwyu_aspect_factory-verbose">verbose</a>)
</pre>

Create a "Depend on What You Use" (DWYU) aspect.

**PARAMETERS**


| Name | Description | Default Value |
| :------------- | :------------- | :------------- |
| <a id="dwyu_aspect_factory-ignored_includes"></a>ignored_includes | By default, DWYU ignores all headers from the standard library when comparing include statements to the dependencies. This list of headers can be seen in [std_header.py](/src/analyze_includes/std_header.py).<br> You can extend this list of ignored headers or replace it with a custom one by providing a json file with the information to this attribute. This feature is demonstrated in the [ignoring_includes example](/examples/ignoring_includes).<br> Specification of possible files in the json file:<br> - `ignore_include_paths` : List of include paths which are ignored by the analysis. Setting this **disables ignoring the standard library include paths**.<br> - `extra_ignore_include_paths` : List of concrete include paths which are ignored by the analysis. Those are always ignored, no matter what other fields you provide.<br> - `ignore_include_patterns` : List of patterns for include paths which are ignored by the analysis. Patterns have to be compatible to Python [regex syntax](https://docs.python.org/3/library/re.html#regular-expression-syntax). The [match](https://docs.python.org/3/library/re.html#re.match) function is used to process the patterns.<br> | `None` |
| <a id="dwyu_aspect_factory-recursive"></a>recursive | By default, the DWYU aspect analyzes only the target it is being applied to. You can change this to recursively analyzing dependencies following the `deps` and `implementation_deps` attributes by setting this to True.<br> This feature is demonstrated in the [recursion example](/examples/recursion). | `False` |
| <a id="dwyu_aspect_factory-skip_external_targets"></a>skip_external_targets | If a target is from an external workspace DWYU skips analyzing it. | `False` |
| <a id="dwyu_aspect_factory-skipped_tags"></a>skipped_tags | Do not execute the aspect on targets with at least one of those tags. By default skips the analysis for targets tagged with 'no-dwyu'. | `None` |
| <a id="dwyu_aspect_factory-target_mapping"></a>target_mapping | A target providing a map of target labels to alternative CcInfo provider objects for those targets. Typically created with the dwyu_make_cc_info_mapping rule. | `None` |
| <a id="dwyu_aspect_factory-use_implementation_deps"></a>use_implementation_deps | If true, ensure cc_library dependencies which are used only in private files are listed in implementation_deps. Only available if flag '--experimental_cc_implementation_deps' is provided. | `False` |
| <a id="dwyu_aspect_factory-verbose"></a>verbose | If true, print debugging information about what DWYU does internally. | `False` |

**RETURNS**

Configured DWYU aspect


19 changes: 19 additions & 0 deletions src/aspect/BUILD
Original file line number Diff line number Diff line change
@@ -1,7 +1,26 @@
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
load("@rules_python//python:defs.bzl", "py_binary")

py_binary(
name = "process_target",
srcs = ["process_target.py"],
visibility = ["//visibility:public"],
)

bzl_library(
name = "factory",
srcs = [
"dwyu.bzl",
"factory.bzl",
"@bazel_tools//tools/build_defs/cc:action_names.bzl",
],
visibility = ["//visibility:public"],
deps = [
"//src/cc_info_mapping",
],
)

exports_files(
["factory.bzl"],
visibility = ["//docs:__pkg__"],
)
2 changes: 1 addition & 1 deletion src/aspect/dwyu.bzl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "CPP_COMPILE_ACTION_NAME")
load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
load("@depend_on_what_you_use//src/cc_info_mapping:cc_info_mapping.bzl", "DwyuCcInfoRemappingsInfo")
load("@depend_on_what_you_use//src/cc_info_mapping:providers.bzl", "DwyuCcInfoRemappingsInfo")
load("@rules_cc//cc:defs.bzl", "CcInfo", "cc_common")

def _is_external(ctx):
Expand Down
22 changes: 17 additions & 5 deletions src/aspect/factory.bzl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@depend_on_what_you_use//src/cc_info_mapping:cc_info_mapping.bzl", "DwyuCcInfoRemappingsInfo")
load("@depend_on_what_you_use//src/cc_info_mapping:providers.bzl", "DwyuCcInfoRemappingsInfo")
load(":dwyu.bzl", "dwyu_aspect_impl")

def dwyu_aspect_factory(
Expand All @@ -13,10 +13,21 @@ def dwyu_aspect_factory(
Create a "Depend on What You Use" (DWYU) aspect.
Args:
ignored_includes: Configuration file specifying which include statements should be skipped during analysis. When
nothing is specified, the standard library headers are ignored by default.
recursive: If true, execute the aspect on all transitive dependencies.
If false, analyze only the target the aspect is being executed on.
ignored_includes: By default, DWYU ignores all headers from the standard library when comparing include statements to the dependencies.
This list of headers can be seen in [std_header.py](/src/analyze_includes/std_header.py).<br>
You can extend this list of ignored headers or replace it with a custom one by providing a json file with the information to this attribute.
This feature is demonstrated in the [ignoring_includes example](/examples/ignoring_includes).<br>
Specification of possible files in the json file:<br>
- `ignore_include_paths` : List of include paths which are ignored by the analysis.
Setting this **disables ignoring the standard library include paths**.<br>
- `extra_ignore_include_paths` : List of concrete include paths which are ignored by the analysis.
Those are always ignored, no matter what other fields you provide.<br>
- `ignore_include_patterns` : List of patterns for include paths which are ignored by the analysis.
Patterns have to be compatible to Python [regex syntax](https://docs.python.org/3/library/re.html#regular-expression-syntax).
The [match](https://docs.python.org/3/library/re.html#re.match) function is used to process the patterns.<br>
recursive: By default, the DWYU aspect analyzes only the target it is being applied to.
You can change this to recursively analyzing dependencies following the `deps` and `implementation_deps` attributes by setting this to True.<br>
This feature is demonstrated in the [recursion example](/examples/recursion).
skip_external_targets: If a target is from an external workspace DWYU skips analyzing it.
skipped_tags: Do not execute the aspect on targets with at least one of those tags. By default skips the
analysis for targets tagged with 'no-dwyu'.
Expand All @@ -26,6 +37,7 @@ def dwyu_aspect_factory(
listed in implementation_deps. Only available if flag
'--experimental_cc_implementation_deps' is provided.
verbose: If true, print debugging information about what DWYU does internally.
Returns:
Configured DWYU aspect
"""
Expand Down
21 changes: 21 additions & 0 deletions src/cc_info_mapping/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")

bzl_library(
name = "cc_info_mapping",
srcs = [
"cc_info_mapping.bzl",
"providers.bzl",
"@bazel_tools//tools/cpp:toolchain_utils.bzl",
"@rules_cc//cc:bzl_srcs",
],
visibility = ["//visibility:public"],
deps = [
"//src/cc_info_mapping/private:bzl_srcs",
"//src/utils",
],
)

exports_files(
["cc_info_mapping.bzl"],
visibility = ["//docs:__pkg__"],
)
Loading

0 comments on commit 1488605

Please sign in to comment.