Skip to content

Commit

Permalink
*: move internal files into lib subdir
Browse files Browse the repository at this point in the history
They are not part of our public interfaces and must not be imported
alone.
  • Loading branch information
oxalica committed Jun 3, 2024
1 parent b46857a commit 37a2fe6
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion default.nix
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
final: prev:
(import ./rust-overlay.nix final) (prev // (import ./manifest.nix final prev))
(import ./lib/rust-bin.nix final) (prev // (import ./lib/manifests.nix final prev))
2 changes: 1 addition & 1 deletion docs/reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@ All public attributes provided by the overlay are below. Fields not defined here
}
```

For more details, see also the source code of [`rust-overlay.nix`](../rust-overlay.nix).
For more details, see also the source code of [`lib/rust-bin.nix`](../lib/rust-bin.nix).
File renamed without changes.
12 changes: 6 additions & 6 deletions manifest.nix → lib/manifests.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ let
inherit (final.lib)
attrNames concatMap elemAt filter hasAttr mapAttrs mapAttrs' removeSuffix;

targets = import ./manifests/targets.nix // { _ = "*"; };
renamesList = import ./manifests/renames.nix;
profilesList = import ./manifests/profiles.nix;
targets = import ../manifests/targets.nix // { _ = "*"; };
renamesList = import ../manifests/renames.nix;
profilesList = import ../manifests/profiles.nix;

inherit (final.rust-bin) distRoot;

Expand Down Expand Up @@ -117,9 +117,9 @@ in {

# For internal usage.
manifests = {
stable = uncompressManifestSet "stable" (import ./manifests/stable);
beta = uncompressManifestSet "beta" (import ./manifests/beta);
nightly = uncompressManifestSet "nightly" (import ./manifests/nightly);
stable = uncompressManifestSet "stable" (import ../manifests/stable);
beta = uncompressManifestSet "beta" (import ../manifests/beta);
nightly = uncompressManifestSet "nightly" (import ../manifests/nightly);
};
};
}
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 37a2fe6

Please sign in to comment.