Merge pull request #56 from thomasvl/avoid_lib

Remove usage and suggests for lib.bzl.

README.md

@@ -12,8 +12,7 @@ build rules in Bazel.
 
 Each of the `.bzl` files in the `lib` directory defines a "module"—a
 `struct` that contains a set of related functions and/or other symbols that can
-be loaded as a single unit, for convenience. The top-level file `lib.bzl` acts
-as an index from which the other modules can be imported.
+be loaded as a single unit, for convenience.
 
 ## Getting Started
 
@@ -30,17 +29,18 @@ git_repository(
 ```
 
 Then, in the `BUILD` and/or `*.bzl` files in your own workspace, you can load
-the modules (listed [below](#list-of-modules)) from `lib.bzl` and access the
-symbols by dotting into those structs:
+the modules (listed [below](#list-of-modules)) and access the symbols by
+dotting into those structs:
 
 ```python
-load("@bazel_skylib//:lib.bzl", "paths", "shell")
+load("@bazel_skylib//lib/paths.bzl", "paths")
+load("@bazel_skylib//lib/shell.bzl", "shell")
 
 p = paths.basename("foo.bar")
 s = shell.quote(p)
 ```
 
-## List of modules
+## List of modules (in lib/)
 
 * [collections](lib/collections.bzl)
 * [dicts](lib/dicts.bzl)
@@ -78,20 +78,6 @@ Steps to add a module to Skylib:
    )
    ```
 
-1. Add a line to `lib.bzl` to make the new module accessible from the index:
-
-   ```python
-   load("@bazel_skylib//lib:things.bzl", "things")
-   ```
-
-1. Clients can then use the module by loading it from `lib.bzl`:
-
-   ```python
-   load("@bazel_skylib//:lib.bzl", "things")
-
-   things.manipulate()
-   ```
-
 1. Add unit tests for your module in the `tests` directory.
 
 ## `skylark_library`

tests/collections_tests.bzl

@@ -14,7 +14,8 @@
 
 """Unit tests for collections.bzl."""
 
-load("//:lib.bzl", "asserts", "collections", "unittest")
+load("//lib:collections.bzl", "collections")
+load("//lib:unittest.bzl", "asserts", "unittest")
 
 def _after_each_test(ctx):
     """Unit tests for collections.after_each."""

tests/dicts_tests.bzl

@@ -14,7 +14,8 @@
 
 """Unit tests for dicts.bzl."""
 
-load("//:lib.bzl", "asserts", "dicts", "unittest")
+load("//lib:dicts.bzl", "dicts")
+load("//lib:unittest.bzl", "asserts", "unittest")
 
 def _add_test(ctx):
     """Unit tests for dicts.add."""

tests/partial_tests.bzl

@@ -14,7 +14,8 @@
 
 """Unit tests for partial.bzl."""
 
-load("//:lib.bzl", "asserts", "partial", "unittest")
+load("//lib:partial.bzl", "partial")
+load("//lib:unittest.bzl", "asserts", "unittest")
 
 def _make_noargs_nokwargs():
     """Test utility for no args no kwargs case"""

tests/paths_tests.bzl

@@ -14,7 +14,8 @@
 
 """Unit tests for paths.bzl."""
 
-load("//:lib.bzl", "asserts", "paths", "unittest")
+load("//lib:paths.bzl", "paths")
+load("//lib:unittest.bzl", "asserts", "unittest")
 
 def _basename_test(ctx):
     """Unit tests for paths.basename."""

tests/selects_tests.bzl

@@ -14,7 +14,8 @@
 
 """Unit tests for selects.bzl."""
 
-load("//:lib.bzl", "asserts", "selects", "unittest")
+load("//lib:selects.bzl", "selects")
+load("//lib:unittest.bzl", "asserts", "unittest")
 
 def _with_or_test(ctx):
     """Unit tests for with_or."""

tests/sets_tests.bzl

@@ -14,7 +14,8 @@
 
 """Unit tests for sets.bzl."""
 
-load("//:lib.bzl", "asserts", "sets", "unittest")
+load("//lib:sets.bzl", "sets")
+load("//lib:unittest.bzl", "asserts", "unittest")
 
 def _is_equal_test(ctx):
     """Unit tests for sets.is_equal."""

tests/shell_tests.bzl

@@ -14,7 +14,8 @@
 
 """Unit tests for shell.bzl."""
 
-load("//:lib.bzl", "asserts", "shell", "unittest")
+load("//lib:shell.bzl", "shell")
+load("//lib:unittest.bzl", "asserts", "unittest")
 
 def _shell_array_literal_test(ctx):
     """Unit tests for shell.array_literal."""

tests/structs_tests.bzl

@@ -14,7 +14,8 @@
 
 """Unit tests for structs.bzl."""
 
-load("//:lib.bzl", "asserts", "structs", "unittest")
+load("//lib:structs.bzl", "structs")
+load("//lib:unittest.bzl", "asserts", "unittest")
 
 def _add_test(ctx):
     """Unit tests for dicts.add."""

tests/types_tests.bzl

@@ -13,7 +13,8 @@
 # limitations under the License.
 """Unit tests for types.bzl."""
 
-load("//:lib.bzl", "asserts", "types", "unittest")
+load("//lib:types.bzl", "types")
+load("//lib:unittest.bzl", "asserts", "unittest")
 
 def _a_function():
     """A dummy function for testing."""

tests/versions_tests.bzl

@@ -14,7 +14,8 @@
 
 """Unit tests for versions.bzl."""
 
-load("//:lib.bzl", "asserts", "unittest", "versions")
+load("//lib:unittest.bzl", "asserts", "unittest")
+load("//lib:versions.bzl", "versions")
 
 def _parse_test(ctx):
     """Unit tests for versions.parse"""