Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/status.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ pub enum Status {
/// branch would break.
ProblemsIntroduced(Vec<Problem>),

/// This PR introduces additional instances of discouraged patterns. Merging is discouraged but
/// would not break the base branch.
/// This PR introduces additional instances of discouraged patterns. Please fix them before
/// merging.
DiscouragedPatternedIntroduced(Vec<Problem>),

/// Some other error occurred.
Expand Down Expand Up @@ -70,7 +70,7 @@ impl Status {
),
Self::DiscouragedPatternedIntroduced(..) => maybe_yellow(
"This PR introduces additional instances of discouraged patterns as listed above. \
Merging is discouraged but would not break the base branch.",
Please fix them before merging.",
),
};
fmt::Display::fmt(&message, f)
Expand Down
2 changes: 1 addition & 1 deletion tests/manual-definition/expected
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@

Such a definition is provided automatically and therefore not necessary. Please remove it.

This PR introduces additional instances of discouraged patterns as listed above. Merging is discouraged but would not break the base branch.
This PR introduces additional instances of discouraged patterns as listed above. Please fix them before merging.
2 changes: 1 addition & 1 deletion tests/move-to-non-by-name/expected
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
- Attribute `pkgs.foo4` was previously defined in pkgs/by-name/fo/foo4/package.nix, but is now manually defined as `callPackage ./with-config.nix { ... }` in pkgs/top-level/all-packages.nix.
While the manual `callPackage` is still needed, it's not necessary to move the package files.

This PR introduces additional instances of discouraged patterns as listed above. Merging is discouraged but would not break the base branch.
This PR introduces additional instances of discouraged patterns as listed above. Please fix them before merging.
2 changes: 1 addition & 1 deletion tests/new-package-non-by-name/expected
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
See `pkgs/by-name/README.md` for more details.
Since the second `callPackage` argument is not `{ }`, the manual `callPackage` in pkgs/top-level/all-packages.nix is still needed.

This PR introduces additional instances of discouraged patterns as listed above. Merging is discouraged but would not break the base branch.
This PR introduces additional instances of discouraged patterns as listed above. Please fix them before merging.
2 changes: 1 addition & 1 deletion tests/override-empty-arg/expected
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@

Such a definition is provided automatically and therefore not necessary. Please remove it.

This PR introduces additional instances of discouraged patterns as listed above. Merging is discouraged but would not break the base branch.
This PR introduces additional instances of discouraged patterns as listed above. Please fix them before merging.
2 changes: 1 addition & 1 deletion tests/sorted-order/expected
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@
See `pkgs/by-name/README.md` for more details.
Since the second `callPackage` argument is `{ }`, no manual `callPackage` in pkgs/top-level/all-packages.nix is needed anymore.

This PR introduces additional instances of discouraged patterns as listed above. Merging is discouraged but would not break the base branch.
This PR introduces additional instances of discouraged patterns as listed above. Please fix them before merging.