Skip to content

Rework future tense in user-facing messages#13353

Merged
roberth merged 5 commits into
NixOS:masterfrom
lucperkins:messages-present-tense
Jun 20, 2025
Merged

Rework future tense in user-facing messages#13353
roberth merged 5 commits into
NixOS:masterfrom
lucperkins:messages-present-tense

Conversation

@lucperkins
Copy link
Copy Markdown
Contributor

@lucperkins lucperkins commented Jun 12, 2025

Motivation

There's a tendency that a lot of us have when writing English to use a kind of "fake" future tense to express regular or expected connections between things. In general, though, it's better to reserve the future tense for things that will happen in the future and use simple present tense to express "if x then y"-style connections. Changes correspond to this PR.

@github-actions github-actions Bot added new-cli Relating to the "nix" command with-tests Issues related to testing. PRs with tests have some priority fetching Networking with the outside (non-Nix) world, input locking labels Jun 12, 2025
Comment thread src/libstore/include/nix/store/s3-binary-cache-store.hh
Comment thread tests/nixos/github-flakes.nix
Comment thread tests/nixos/github-flakes.nix Outdated
@lucperkins lucperkins requested a review from Ericson2314 June 19, 2025 17:57
@cole-h
Copy link
Copy Markdown
Member

cole-h commented Jun 19, 2025

FYI, CI is failing because you missed updating the wording in a test. Here's a diff fixing that.

diff --git a/tests/functional/fetchGitShallow.sh b/tests/functional/fetchGitShallow.sh
index cf7e5fd4fb..4c21bd7ac8 100644
--- a/tests/functional/fetchGitShallow.sh
+++ b/tests/functional/fetchGitShallow.sh
@@ -43,7 +43,7 @@
 [[ $(nix eval --impure --expr "(builtins.fetchTree { type = \"git\"; url = \"file://$TEST_ROOT/shallow-clone\"; ref = \"dev\"; shallow = true; }).revCount or 123") == 123 ]]
 
 # Test 3: Check unlocked input error message
-expectStderr 1 nix eval --expr 'builtins.fetchTree { type = "git"; url = "file:///foo"; }' | grepQuiet "'fetchTree' will not fetch unlocked input"
+expectStderr 1 nix eval --expr 'builtins.fetchTree { type = "git"; url = "file:///foo"; }' | grepQuiet "'fetchTree' doesn't fetch unlocked input"
 
 # Test 4: Regression test for revCount in worktrees derived from shallow clones
 # Add a worktree to the shallow clone

@roberth roberth merged commit 42ea272 into NixOS:master Jun 20, 2025
12 checks passed
@roberth
Copy link
Copy Markdown
Member

roberth commented Jun 20, 2025

Thanks!

@lucperkins lucperkins deleted the messages-present-tense branch June 20, 2025 14:55
@roberth roberth added the backports ignored Seen but not applied label Jul 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backports ignored Seen but not applied fetching Networking with the outside (non-Nix) world, input locking new-cli Relating to the "nix" command with-tests Issues related to testing. PRs with tests have some priority

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants