From b47f336dbe834f0a1c729fe716b95bea0e9e418d Mon Sep 17 00:00:00 2001 From: Erik Schierboom Date: Thu, 18 Jan 2024 12:36:46 +0100 Subject: [PATCH] Don't use parentheses for quit argument --- bin/bump_version.nim | 2 +- bin/tag_release.nim | 2 +- src/cli.nim | 4 ++-- src/configlet.nim | 2 +- src/create/create.nim | 12 ++++++------ src/exec.nim | 2 +- src/fmt/exercises.nim | 2 +- src/fmt/fmt.nim | 4 ++-- src/generate/generate.nim | 6 +++--- src/helpers.nim | 4 ++-- src/lint/lint.nim | 2 +- src/sync/probspecs.nim | 4 ++-- src/sync/sync.nim | 6 +++--- src/sync/sync_common.nim | 2 +- src/sync/sync_docs.nim | 2 +- src/sync/sync_filepaths.nim | 2 +- src/sync/sync_metadata.nim | 2 +- src/sync/tracks.nim | 8 ++++---- src/uuid/uuid.nim | 2 +- 19 files changed, 35 insertions(+), 35 deletions(-) diff --git a/bin/bump_version.nim b/bin/bump_version.nim index fbd5c4f3..9a5cb48c 100755 --- a/bin/bump_version.nim +++ b/bin/bump_version.nim @@ -264,7 +264,7 @@ proc main = except BumpError: let msg = getCurrentExceptionMsg() stderr.writeLine &"Error: {msg}" - quit(QuitFailure) + quit QuitFailure when isMainModule: main() diff --git a/bin/tag_release.nim b/bin/tag_release.nim index cd2b22b0..04fe8fc0 100755 --- a/bin/tag_release.nim +++ b/bin/tag_release.nim @@ -68,7 +68,7 @@ proc main = except BumpError: let msg = getCurrentExceptionMsg() stderr.writeLine &"Error: {msg}" - quit(QuitFailure) + quit QuitFailure when isMainModule: main() diff --git a/src/cli.nim b/src/cli.nim index 9d519a9d..4e39d81e 100644 --- a/src/cli.nim +++ b/src/cli.nim @@ -338,7 +338,7 @@ proc showHelp(exitCode: range[0..255] = 0, prependDashedLine = false) = proc showVersion = echo &"{configletVersion}" - quit(QuitSuccess) + quit QuitSuccess proc shouldUseColor(f: File): bool = ## Returns true if we should write to `f` with color. @@ -359,7 +359,7 @@ proc showError*(s: string, writeHelp = true) = if writeHelp: showHelp(exitCode = 1, prependDashedLine = true) else: - quit(QuitFailure) + quit QuitFailure func formatOpt(kind: CmdLineKind, key: string, val = ""): string = ## Returns a string that describes an option, given its `kind`, `key` and diff --git a/src/configlet.nim b/src/configlet.nim index 1d08833c..a9555850 100644 --- a/src/configlet.nim +++ b/src/configlet.nim @@ -4,7 +4,7 @@ import "."/[cli, completion/completion, create/create, fmt/fmt, info/info, proc configlet = onSignal(SIGTERM): - quit(QuitSuccess) + quit QuitSuccess let conf = processCmdLine() diff --git a/src/create/create.nim b/src/create/create.nim index 676a82e3..4803f589 100644 --- a/src/create/create.nim +++ b/src/create/create.nim @@ -7,12 +7,12 @@ proc create*(conf: Conf) = if conf.action.exerciseCreate.len == 0: let msg = "Please specify an exercise, using --exercise " stderr.writeLine msg - quit(QuitFailure) + quit QuitFailure if conf.action.approachSlug.len > 0: if conf.action.articleSlug.len > 0: let msg = &"Both --approach and --article were provided. Please specify only one." stderr.writeLine msg - quit(QuitFailure) + quit QuitFailure let trackConfigPath = conf.trackDir / "config.json" let trackConfig = parseFile(trackConfigPath, TrackConfig) let trackExerciseSlugs = getSlugs(trackConfig.exercises, conf, trackConfigPath) @@ -28,7 +28,7 @@ proc create*(conf: Conf) = &"exercise slug, but `{userExercise}` is not an slug in the " & &"track config:\n{trackConfigPath}" stderr.writeLine msg - quit(QuitFailure) + quit QuitFailure createApproach(Slug(conf.action.approachSlug), userExercise, exerciseDir) elif conf.action.articleSlug.len > 0: @@ -47,12 +47,12 @@ proc create*(conf: Conf) = &"exercise slug, but `{userExercise}` is not an slug in the " & &"track config:\n{trackConfigPath}" stderr.writeLine msg - quit(QuitFailure) + quit QuitFailure createArticle(Slug(conf.action.articleSlug), userExercise, exerciseDir) else: let msg = "Please specify `--article ` or `--approach `" stderr.writeLine msg - quit(QuitFailure) + quit QuitFailure else: - quit(QuitFailure) + quit QuitFailure diff --git a/src/exec.nim b/src/exec.nim index 59454d6e..32fdb960 100644 --- a/src/exec.nim +++ b/src/exec.nim @@ -98,7 +98,7 @@ proc cloneExercismRepo*(repoName, dest: string; shallow = false; else: stderr.writeLine "failure" stderr.writeLine outp - quit(QuitFailure) + quit QuitFailure proc gitCheckout(dir, hash: string) = ## Checkout `hash` in the git repo at `dir`, discarding changes to the working diff --git a/src/fmt/exercises.nim b/src/fmt/exercises.nim index f7ffd3ae..275c8373 100644 --- a/src/fmt/exercises.nim +++ b/src/fmt/exercises.nim @@ -93,7 +93,7 @@ proc addObject(s: var string; key: string; val: JsonNode; indentLevel = 1) = else: stderr.writeLine &"The value of a `{key}` key is not a JSON object:" stderr.writeLine val.pretty() - quit(QuitFailure) + quit QuitFailure func exerciseConfigKeyOrderForSync(originalKeyOrder: seq[ ExerciseConfigKey]): seq[ExerciseConfigKey] = diff --git a/src/fmt/fmt.nim b/src/fmt/fmt.nim index e9df1c0c..2e181edf 100644 --- a/src/fmt/fmt.nim +++ b/src/fmt/fmt.nim @@ -141,9 +141,9 @@ proc fmt*(conf: Conf) = if conf.action.yesFmt or userSaysYes(userExercise): writeFormatted(pairs) else: - quit(QuitFailure) + quit QuitFailure else: - quit(QuitFailure) + quit QuitFailure else: let wording = if userExercise.len > 0: diff --git a/src/generate/generate.nim b/src/generate/generate.nim index 2a3ad4e4..ddb5762b 100644 --- a/src/generate/generate.nim +++ b/src/generate/generate.nim @@ -77,11 +77,11 @@ proc conceptIntroduction(trackDir: Path, slug: Slug, templatePath: Path, result = path.readFile().alterHeadings(linkDefs, h2) else: writeError(&"File {path} not found for concept '{slug}'", templatePath) - quit(QuitFailure) + quit QuitFailure else: writeError(&"Directory {conceptDir} not found for concept '{slug}'", templatePath) - quit(QuitFailure) + quit QuitFailure proc generateIntroduction(trackDir: Path, templatePath: Path, slugLookup: Table[Slug, string]): string = @@ -119,7 +119,7 @@ proc generateIntroduction(trackDir: Path, templatePath: Path, else: writeError(&"Concept '{conceptSlug}' does not exist in track config.json", templatePath) - quit(QuitFailure) + quit QuitFailure else: if content.continuesWith("\n#", i): headingLevel = content.skipWhile({'#'}, i+1) diff --git a/src/helpers.nim b/src/helpers.nim index 4f4739a9..5173b8ec 100644 --- a/src/helpers.nim +++ b/src/helpers.nim @@ -146,7 +146,7 @@ proc parseFile*(path: string; T: typedesc): T = except IOError: let msg = getCurrentExceptionMsg() stderr.writeLine &"Error: {msg}" - quit(QuitFailure) + quit QuitFailure if contents.len > 0: try: contents.fromJson(T) @@ -155,6 +155,6 @@ proc parseFile*(path: string; T: typedesc): T = let details = tidyJsonyMessage(jsonyMsg, contents) let msg = &"JSON parsing error:\n{path}{details}" stderr.writeLine msg - quit(QuitFailure) + quit QuitFailure else: T() diff --git a/src/lint/lint.nim b/src/lint/lint.nim index b67c6475..bba3bcbe 100644 --- a/src/lint/lint.nim +++ b/src/lint/lint.nim @@ -61,4 +61,4 @@ proc lint*(conf: Conf) = Configlet detected at least one problem. For more information on resolving the problems, please see the documentation: {url}""".unindent() - quit(QuitFailure) + quit QuitFailure diff --git a/src/sync/probspecs.nim b/src/sync/probspecs.nim index 39e017bc..68e4b03f 100644 --- a/src/sync/probspecs.nim +++ b/src/sync/probspecs.nim @@ -197,11 +197,11 @@ proc init*(T: typedesc[ProbSpecsDir], conf: Conf): T = 'problem-specifications' elsewhere, you can copy it to the above location and then use it with --offline.""".unindent() stderr.writeLine msg - quit(QuitFailure) + quit QuitFailure else: try: createDir result.parentDir() except IOError, OSError: stderr.writeLine &"Error: {getCurrentExceptionMsg()}" - quit(QuitFailure) + quit QuitFailure cloneExercismRepo("problem-specifications", result.string, shallow = false) diff --git a/src/sync/sync.nim b/src/sync/sync.nim index a22f03cf..a52c79a3 100644 --- a/src/sync/sync.nim +++ b/src/sync/sync.nim @@ -78,7 +78,7 @@ proc getSlugs*(exercises: Exercises, conf: Conf, &"exercise slug, but `{userExercise}` is not an slug in the " & &"track config:\n{trackConfigPath}" stderr.writeLine msg - quit(QuitFailure) + quit QuitFailure proc syncImpl(conf: Conf): set[SyncKind] = ## Checks the data specified in `conf.action.scope`, and updates them if @@ -149,7 +149,7 @@ proc sync*(conf: Conf) = if seenUnsynced.len > 0: for syncKind in seenUnsynced: logNormal(&"[warn] some exercises {explain(syncKind)}") - quit(QuitFailure) + quit QuitFailure else: let userExercise = conf.action.exercise let wording = @@ -162,4 +162,4 @@ proc sync*(conf: Conf) = else: for syncKind in conf.action.scope: logNormal(&"{wording} has up-to-date {syncKind}!") - quit(QuitSuccess) + quit QuitSuccess diff --git a/src/sync/sync_common.nim b/src/sync/sync_common.nim index 5b78964b..879a609b 100644 --- a/src/sync/sync_common.nim +++ b/src/sync/sync_common.nim @@ -22,7 +22,7 @@ proc postHook*(e: ConceptExercise | PracticeExercise) = let msg = "Error: the track `config.json` file contains " & &"an exercise slug of \"{s}\", which is not a kebab-case string" stderr.writeLine msg - quit(QuitFailure) + quit QuitFailure func getSlugs*(e: seq[ConceptExercise] | seq[PracticeExercise], withDeprecated = true): seq[Slug] = diff --git a/src/sync/sync_docs.nim b/src/sync/sync_docs.nim index 55efe5aa..0483747c 100644 --- a/src/sync/sync_docs.nim +++ b/src/sync/sync_docs.nim @@ -123,7 +123,7 @@ proc write(pairsToWrite: seq[PathAndContents]) = writeFile(path, pathAndContents.contents) else: stderr.writeLine &"Unexpected path before writing: {path}" - quit(QuitFailure) + quit QuitFailure let s = if pairsToWrite.len > 1: "s" else: "" logNormal(&"Updated the docs for {pairsToWrite.len} Practice Exercise{s}") diff --git a/src/sync/sync_filepaths.nim b/src/sync/sync_filepaths.nim index 252d470c..564b4397 100644 --- a/src/sync/sync_filepaths.nim +++ b/src/sync/sync_filepaths.nim @@ -129,7 +129,7 @@ proc write(configPairs: seq[PathAndUpdatedExerciseConfig]) = writeFile(path, contents) else: stderr.writeLine &"Unexpected path before writing: {path}" - quit(QuitFailure) + quit QuitFailure let s = if configPairs.len > 1: "s" else: "" logNormal(&"Updated the filepaths for {configPairs.len} exercise{s}") diff --git a/src/sync/sync_metadata.nim b/src/sync/sync_metadata.nim index 1428176c..49198401 100644 --- a/src/sync/sync_metadata.nim +++ b/src/sync/sync_metadata.nim @@ -101,7 +101,7 @@ proc write(configPairs: seq[PathAndUpdatedConfig]) = writeFile(path, updatedJson) else: stderr.writeLine &"Unexpected path before writing: {path}" - quit(QuitFailure) + quit QuitFailure let s = if configPairs.len > 1: "s" else: "" logNormal(&"Updated the metadata for {configPairs.len} Practice Exercise{s}") diff --git a/src/sync/tracks.nim b/src/sync/tracks.nim index f31eae5e..6888b65c 100644 --- a/src/sync/tracks.nim +++ b/src/sync/tracks.nim @@ -50,10 +50,10 @@ proc getPracticeExerciseSlugs(trackDir: TrackDir, else: stderr.writeLine "Error: file does not have an `exercises` key:\n" & configFile - quit(QuitFailure) + quit QuitFailure else: stderr.writeLine "Error: file does not exist:\n" & configFile - quit(QuitFailure) + quit QuitFailure sort result @@ -79,10 +79,10 @@ proc init(T: typedesc[PracticeExerciseTests], testsPath: string): T = The expected 'tests.toml' format is documented in https://exercism.org/docs/building/configlet/sync#h-tests""".unindent() - quit(QuitFailure) + quit QuitFailure except CatchableError: stderr.writeLine "Error: " & getCurrentExceptionMsg() - quit(QuitFailure) + quit QuitFailure for uuid, val in tests.getTable(): if val.hasKey("include"): diff --git a/src/uuid/uuid.nim b/src/uuid/uuid.nim index fb64c8bd..e35361e0 100644 --- a/src/uuid/uuid.nim +++ b/src/uuid/uuid.nim @@ -11,7 +11,7 @@ proc genUuid*: Uuid {.noinit.} = result[8] = (result[8] and 0x3f) or 0x80 # Set variant to 1 else: stderr.writeLine "uuid: error: failed to read from the system CSPRNG" - quit(QuitFailure) + quit QuitFailure func `$`*(u: Uuid): string = ## Returns the canonical string representation for the given UUID `u`.