From acf6c1310be2c08555f7a3cf478bee3461c486b6 Mon Sep 17 00:00:00 2001 From: David Meister Date: Sun, 16 Aug 2026 18:46:32 +0000 Subject: [PATCH 1/3] chore: bump forge-std to 1.16.2 forge-std is the only dependency and the version is baked into every import prefix, so the pin, the lockfile, the remappings and all 23 import statements move together. Closes #90 Co-Authored-By: Claude Opus 5 (1M context) --- foundry.toml | 2 +- remappings.txt | 2 +- script/Build.sol | 2 +- soldeer.lock | 8 ++++---- src/lib/LibCodeGen.sol | 2 +- src/lib/LibFs.sol | 2 +- src/lib/LibHexString.sol | 2 +- test/concrete/LibFsExternal.sol | 2 +- test/concrete/LibHexStringExternal.sol | 2 +- test/lib/LibCodeGen.addressConstantString.t.sol | 2 +- test/lib/LibCodeGen.bytecodeHashConstantString.t.sol | 2 +- test/lib/LibCodeGen.bytes32ConstantString.t.sol | 2 +- test/lib/LibCodeGen.bytesConstantString.t.sol | 2 +- .../LibCodeGen.describedByMetaHashConstantString.t.sol | 2 +- test/lib/LibCodeGen.filePrefix.t.sol | 2 +- ...bCodeGen.integrityFunctionPointersConstantString.t.sol | 2 +- ...eGen.literalParserFunctionPointersConstantString.t.sol | 2 +- .../LibCodeGen.opcodeFunctionPointersConstantString.t.sol | 2 +- ...Gen.operandHandlerFunctionPointersConstantString.t.sol | 2 +- test/lib/LibCodeGen.requireContractName.t.sol | 2 +- .../LibCodeGen.subParserWordParsersConstantString.t.sol | 2 +- test/lib/LibCodeGen.uint8ConstantString.t.sol | 2 +- test/lib/LibCodeGenSlow.sol | 2 +- test/lib/LibFs.buildFileForContract.t.sol | 2 +- test/lib/LibFs.t.sol | 2 +- test/lib/LibHexString.bytesToHex.t.sol | 4 ++-- 26 files changed, 30 insertions(+), 30 deletions(-) diff --git a/foundry.toml b/foundry.toml index 1582348..1398579 100644 --- a/foundry.toml +++ b/foundry.toml @@ -37,7 +37,7 @@ fs_permissions = [ runs = 2048 [dependencies] -forge-std = "1.16.1" +forge-std = "1.16.2" [soldeer] recursive_deps = false diff --git a/remappings.txt b/remappings.txt index f4f4742..007ea51 100644 --- a/remappings.txt +++ b/remappings.txt @@ -1 +1 @@ -forge-std-1.16.1/=dependencies/forge-std-1.16.1/ +forge-std-1.16.2/=dependencies/forge-std-1.16.2/ diff --git a/script/Build.sol b/script/Build.sol index b2735f2..acd8f04 100644 --- a/script/Build.sol +++ b/script/Build.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Script} from "forge-std-1.16.1/src/Script.sol"; +import {Script} from "forge-std-1.16.2/src/Script.sol"; import {LibFs} from "../src/lib/LibFs.sol"; import {LibCodeGen} from "../src/lib/LibCodeGen.sol"; import {CodeGennable} from "../test/concrete/CodeGennable.sol"; diff --git a/soldeer.lock b/soldeer.lock index e9184e4..c8574b4 100644 --- a/soldeer.lock +++ b/soldeer.lock @@ -1,6 +1,6 @@ [[dependencies]] name = "forge-std" -version = "1.16.1" -url = "https://soldeer-revisions.s3.amazonaws.com/forge-std/1_16_1_08-05-2026_08:51:16_forge-std-1.16.zip" -checksum = "839b61832925c7152c7b6dffbfa4998d9e606211179bd8f604733124e8a7cb57" -integrity = "60e55d10150354ca4a1e2985c5456c834b92b82ef85ab0e1d92a7786cddbd219" +version = "1.16.2" +url = "https://soldeer-revisions.s3.amazonaws.com/forge-std/1_16_2_03-07-2026_07:37:45_forge-std-1.16.zip" +checksum = "405dccc9d60d753f6abc412b4adf0359f4390f65dbadbbb277a12b4946ed8969" +integrity = "5fb4325b60d7d4194bd0481e2f94398cf1d9c6561dd12a66fb2748ef4a68205f" diff --git a/src/lib/LibCodeGen.sol b/src/lib/LibCodeGen.sol index 04971ff..400ad01 100644 --- a/src/lib/LibCodeGen.sol +++ b/src/lib/LibCodeGen.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity ^0.8.25; -import {Vm} from "forge-std-1.16.1/src/Vm.sol"; +import {Vm} from "forge-std-1.16.2/src/Vm.sol"; import {IOpcodeToolingV1} from "../interface/IOpcodeToolingV1.sol"; import {IParserToolingV1} from "../interface/IParserToolingV1.sol"; import {ISubParserToolingV1} from "../interface/ISubParserToolingV1.sol"; diff --git a/src/lib/LibFs.sol b/src/lib/LibFs.sol index 9ad096f..8d38043 100644 --- a/src/lib/LibFs.sol +++ b/src/lib/LibFs.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity ^0.8.25; -import {Vm} from "forge-std-1.16.1/src/Vm.sol"; +import {Vm} from "forge-std-1.16.2/src/Vm.sol"; import {LibCodeGen} from "./LibCodeGen.sol"; /// @dev The directory that generated contract files are written to, relative to diff --git a/src/lib/LibHexString.sol b/src/lib/LibHexString.sol index bd0c8b8..aa3f805 100644 --- a/src/lib/LibHexString.sol +++ b/src/lib/LibHexString.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity ^0.8.25; -import {Vm} from "forge-std-1.16.1/src/Vm.sol"; +import {Vm} from "forge-std-1.16.2/src/Vm.sol"; /// Thrown when the `Vm` handed to `bytesToHex` does not return the string that /// `toString(bytes)` is defined to return, which is "0x" followed by exactly two diff --git a/test/concrete/LibFsExternal.sol b/test/concrete/LibFsExternal.sol index 40b99cc..daa4560 100644 --- a/test/concrete/LibFsExternal.sol +++ b/test/concrete/LibFsExternal.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Vm} from "forge-std-1.16.1/src/Vm.sol"; +import {Vm} from "forge-std-1.16.2/src/Vm.sol"; import {LibFs} from "src/lib/LibFs.sol"; /// @title LibFsExternal diff --git a/test/concrete/LibHexStringExternal.sol b/test/concrete/LibHexStringExternal.sol index 26f2485..a63bc15 100644 --- a/test/concrete/LibHexStringExternal.sol +++ b/test/concrete/LibHexStringExternal.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Vm} from "forge-std-1.16.1/src/Vm.sol"; +import {Vm} from "forge-std-1.16.2/src/Vm.sol"; import {LibHexString} from "src/lib/LibHexString.sol"; /// @title LibHexStringExternal diff --git a/test/lib/LibCodeGen.addressConstantString.t.sol b/test/lib/LibCodeGen.addressConstantString.t.sol index 2d61c06..1f85364 100644 --- a/test/lib/LibCodeGen.addressConstantString.t.sol +++ b/test/lib/LibCodeGen.addressConstantString.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test} from "forge-std-1.16.1/src/Test.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; import {LibCodeGen, MAX_LINE_LENGTH} from "src/lib/LibCodeGen.sol"; import {LibCodeGenSlow} from "./LibCodeGenSlow.sol"; diff --git a/test/lib/LibCodeGen.bytecodeHashConstantString.t.sol b/test/lib/LibCodeGen.bytecodeHashConstantString.t.sol index 705ea48..6842b92 100644 --- a/test/lib/LibCodeGen.bytecodeHashConstantString.t.sol +++ b/test/lib/LibCodeGen.bytecodeHashConstantString.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test} from "forge-std-1.16.1/src/Test.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; import {LibCodeGen, MAX_LINE_LENGTH, CodelessInstance} from "src/lib/LibCodeGen.sol"; import {LibCodeGenSlow} from "./LibCodeGenSlow.sol"; import {CodeGennable} from "../concrete/CodeGennable.sol"; diff --git a/test/lib/LibCodeGen.bytes32ConstantString.t.sol b/test/lib/LibCodeGen.bytes32ConstantString.t.sol index dde10c6..72668bf 100644 --- a/test/lib/LibCodeGen.bytes32ConstantString.t.sol +++ b/test/lib/LibCodeGen.bytes32ConstantString.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test} from "forge-std-1.16.1/src/Test.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; import {LibCodeGen, MAX_LINE_LENGTH} from "src/lib/LibCodeGen.sol"; import {LibCodeGenSlow} from "./LibCodeGenSlow.sol"; diff --git a/test/lib/LibCodeGen.bytesConstantString.t.sol b/test/lib/LibCodeGen.bytesConstantString.t.sol index f3cf2ea..7c46e01 100644 --- a/test/lib/LibCodeGen.bytesConstantString.t.sol +++ b/test/lib/LibCodeGen.bytesConstantString.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test} from "forge-std-1.16.1/src/Test.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; import {LibCodeGen, MAX_LINE_LENGTH} from "src/lib/LibCodeGen.sol"; import {LibCodeGenSlow} from "./LibCodeGenSlow.sol"; diff --git a/test/lib/LibCodeGen.describedByMetaHashConstantString.t.sol b/test/lib/LibCodeGen.describedByMetaHashConstantString.t.sol index ee089ac..88c1f22 100644 --- a/test/lib/LibCodeGen.describedByMetaHashConstantString.t.sol +++ b/test/lib/LibCodeGen.describedByMetaHashConstantString.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test} from "forge-std-1.16.1/src/Test.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; import {LibCodeGen, MAX_LINE_LENGTH, InvalidContractName} from "src/lib/LibCodeGen.sol"; import {LibCodeGenSlow} from "./LibCodeGenSlow.sol"; diff --git a/test/lib/LibCodeGen.filePrefix.t.sol b/test/lib/LibCodeGen.filePrefix.t.sol index 7fc5594..7d568d2 100644 --- a/test/lib/LibCodeGen.filePrefix.t.sol +++ b/test/lib/LibCodeGen.filePrefix.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test} from "forge-std-1.16.1/src/Test.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; import {LibCodeGen} from "src/lib/LibCodeGen.sol"; /// @title LibCodeGenFilePrefixTest diff --git a/test/lib/LibCodeGen.integrityFunctionPointersConstantString.t.sol b/test/lib/LibCodeGen.integrityFunctionPointersConstantString.t.sol index 4e14431..c8cf137 100644 --- a/test/lib/LibCodeGen.integrityFunctionPointersConstantString.t.sol +++ b/test/lib/LibCodeGen.integrityFunctionPointersConstantString.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test} from "forge-std-1.16.1/src/Test.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; import {LibCodeGen} from "src/lib/LibCodeGen.sol"; import {IIntegrityToolingV1} from "src/interface/IIntegrityToolingV1.sol"; import {LibCodeGenSlow} from "./LibCodeGenSlow.sol"; diff --git a/test/lib/LibCodeGen.literalParserFunctionPointersConstantString.t.sol b/test/lib/LibCodeGen.literalParserFunctionPointersConstantString.t.sol index 872e5e7..fb3a663 100644 --- a/test/lib/LibCodeGen.literalParserFunctionPointersConstantString.t.sol +++ b/test/lib/LibCodeGen.literalParserFunctionPointersConstantString.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test} from "forge-std-1.16.1/src/Test.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; import {LibCodeGen} from "src/lib/LibCodeGen.sol"; import {IParserToolingV1} from "src/interface/IParserToolingV1.sol"; import {LibCodeGenSlow} from "./LibCodeGenSlow.sol"; diff --git a/test/lib/LibCodeGen.opcodeFunctionPointersConstantString.t.sol b/test/lib/LibCodeGen.opcodeFunctionPointersConstantString.t.sol index e99c5a2..a463bda 100644 --- a/test/lib/LibCodeGen.opcodeFunctionPointersConstantString.t.sol +++ b/test/lib/LibCodeGen.opcodeFunctionPointersConstantString.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test} from "forge-std-1.16.1/src/Test.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; import {LibCodeGen} from "src/lib/LibCodeGen.sol"; import {IOpcodeToolingV1} from "src/interface/IOpcodeToolingV1.sol"; import {LibCodeGenSlow} from "./LibCodeGenSlow.sol"; diff --git a/test/lib/LibCodeGen.operandHandlerFunctionPointersConstantString.t.sol b/test/lib/LibCodeGen.operandHandlerFunctionPointersConstantString.t.sol index 53e437f..a106086 100644 --- a/test/lib/LibCodeGen.operandHandlerFunctionPointersConstantString.t.sol +++ b/test/lib/LibCodeGen.operandHandlerFunctionPointersConstantString.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test} from "forge-std-1.16.1/src/Test.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; import {LibCodeGen} from "src/lib/LibCodeGen.sol"; import {IParserToolingV1} from "src/interface/IParserToolingV1.sol"; import {LibCodeGenSlow} from "./LibCodeGenSlow.sol"; diff --git a/test/lib/LibCodeGen.requireContractName.t.sol b/test/lib/LibCodeGen.requireContractName.t.sol index acaac78..5a9f5fb 100644 --- a/test/lib/LibCodeGen.requireContractName.t.sol +++ b/test/lib/LibCodeGen.requireContractName.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test} from "forge-std-1.16.1/src/Test.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; import {LibCodeGen, InvalidContractName} from "src/lib/LibCodeGen.sol"; import {LibCodeGenSlow, SLOW_HEAD_ALPHABET, SLOW_TAIL_ALPHABET} from "test/lib/LibCodeGenSlow.sol"; diff --git a/test/lib/LibCodeGen.subParserWordParsersConstantString.t.sol b/test/lib/LibCodeGen.subParserWordParsersConstantString.t.sol index 73f4af8..ec60d51 100644 --- a/test/lib/LibCodeGen.subParserWordParsersConstantString.t.sol +++ b/test/lib/LibCodeGen.subParserWordParsersConstantString.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test} from "forge-std-1.16.1/src/Test.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; import {LibCodeGen} from "src/lib/LibCodeGen.sol"; import {ISubParserToolingV1} from "src/interface/ISubParserToolingV1.sol"; import {LibCodeGenSlow} from "./LibCodeGenSlow.sol"; diff --git a/test/lib/LibCodeGen.uint8ConstantString.t.sol b/test/lib/LibCodeGen.uint8ConstantString.t.sol index 98722cb..a7c1b7e 100644 --- a/test/lib/LibCodeGen.uint8ConstantString.t.sol +++ b/test/lib/LibCodeGen.uint8ConstantString.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test} from "forge-std-1.16.1/src/Test.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; import {LibCodeGen, MAX_LINE_LENGTH} from "src/lib/LibCodeGen.sol"; import {LibCodeGenSlow} from "./LibCodeGenSlow.sol"; diff --git a/test/lib/LibCodeGenSlow.sol b/test/lib/LibCodeGenSlow.sol index bd11101..2e51bb6 100644 --- a/test/lib/LibCodeGenSlow.sol +++ b/test/lib/LibCodeGenSlow.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Vm} from "forge-std-1.16.1/src/Vm.sol"; +import {Vm} from "forge-std-1.16.2/src/Vm.sol"; /// @dev `forge fmt`'s own `line_length` default. Written out here rather than /// imported from `LibCodeGen` so that this reference does not move when the diff --git a/test/lib/LibFs.buildFileForContract.t.sol b/test/lib/LibFs.buildFileForContract.t.sol index a5ed2af..6eec5b7 100644 --- a/test/lib/LibFs.buildFileForContract.t.sol +++ b/test/lib/LibFs.buildFileForContract.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test} from "forge-std-1.16.1/src/Test.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; import {LibFs} from "src/lib/LibFs.sol"; import {LibCodeGen, InvalidContractName} from "src/lib/LibCodeGen.sol"; import {CodeGennable} from "test/concrete/CodeGennable.sol"; diff --git a/test/lib/LibFs.t.sol b/test/lib/LibFs.t.sol index e497e4b..4143c4a 100644 --- a/test/lib/LibFs.t.sol +++ b/test/lib/LibFs.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test} from "forge-std-1.16.1/src/Test.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; import {LibFs, GENERATED_DIR} from "src/lib/LibFs.sol"; import {InvalidContractName} from "src/lib/LibCodeGen.sol"; import {LibFsExternal} from "test/concrete/LibFsExternal.sol"; diff --git a/test/lib/LibHexString.bytesToHex.t.sol b/test/lib/LibHexString.bytesToHex.t.sol index a4163b9..ad77c89 100644 --- a/test/lib/LibHexString.bytesToHex.t.sol +++ b/test/lib/LibHexString.bytesToHex.t.sol @@ -2,8 +2,8 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test} from "forge-std-1.16.1/src/Test.sol"; -import {Vm} from "forge-std-1.16.1/src/Vm.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; +import {Vm} from "forge-std-1.16.2/src/Vm.sol"; import {LibHexString, UnexpectedHexString} from "src/lib/LibHexString.sol"; import {LibCodeGen} from "src/lib/LibCodeGen.sol"; import {LibHexStringExternal} from "test/concrete/LibHexStringExternal.sol"; From 54f3e546a3690ad8a0a8fd133502d90736ed290c Mon Sep 17 00:00:00 2001 From: David Meister Date: Sun, 16 Aug 2026 18:49:24 +0000 Subject: [PATCH 2/3] Carry the 1.16.2 prefix into the files main added Co-Authored-By: Claude Opus 5 (1M context) --- foundry.toml | 2 +- test/src/lib/LibCodeGen.maxLineLength.t.sol | 2 +- test/src/lib/LibFs.isPresent.t.sol | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/foundry.toml b/foundry.toml index 4df7249..d066d32 100644 --- a/foundry.toml +++ b/foundry.toml @@ -27,7 +27,7 @@ cbor_metadata = false evm_version = "cancun" -# No cheatcode in forge-std 1.16.1 creates a symlink, so the tests that pin what +# No cheatcode in forge-std 1.16.2 creates a symlink, so the tests that pin what # this library does when it finds one at a generated path build it with `ln`. ffi = true diff --git a/test/src/lib/LibCodeGen.maxLineLength.t.sol b/test/src/lib/LibCodeGen.maxLineLength.t.sol index 6d2320b..d80b0d5 100644 --- a/test/src/lib/LibCodeGen.maxLineLength.t.sol +++ b/test/src/lib/LibCodeGen.maxLineLength.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test} from "forge-std-1.16.1/src/Test.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; import {MAX_LINE_LENGTH, NEWLINE_DUE_TO_MAX_LENGTH} from "src/lib/LibCodeGen.sol"; /// @title LibCodeGenMaxLineLengthTest diff --git a/test/src/lib/LibFs.isPresent.t.sol b/test/src/lib/LibFs.isPresent.t.sol index 45c5866..50f7762 100644 --- a/test/src/lib/LibFs.isPresent.t.sol +++ b/test/src/lib/LibFs.isPresent.t.sol @@ -2,8 +2,8 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test} from "forge-std-1.16.1/src/Test.sol"; -import {VmSafe} from "forge-std-1.16.1/src/Vm.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; +import {VmSafe} from "forge-std-1.16.2/src/Vm.sol"; import {LibFs, GENERATED_DIR} from "src/lib/LibFs.sol"; /// @title LibFsIsPresentTest @@ -11,7 +11,7 @@ import {LibFs, GENERATED_DIR} from "src/lib/LibFs.sol"; /// that lands somewhere other than the path it was given, so what it answers for /// a symlink is asserted here together with the write that depends on it. /// -/// Symlinks are built with `ln` because forge-std 1.16.1 has no cheatcode that +/// Symlinks are built with `ln` because forge-std 1.16.2 has no cheatcode that /// creates one, and they are read back with `readlink`, which reports the path /// itself and fails on anything that is not a symlink. `vm.readLink` is what the /// library uses, so it is deliberately not what asserts here. From d629371d4b551728d96bb596d24921c2cf7ce2cb Mon Sep 17 00:00:00 2001 From: David Meister Date: Mon, 17 Aug 2026 04:49:31 +0000 Subject: [PATCH 3/3] Rewrite the forge-std prefix over the files main added after this branch #119's four `test/src/interface/*.t.sol` suites and `test/src/lib/LibCodeGen.commentPrefix.t.sol` landed after this branch was cut, each importing `forge-std-1.16.1/src/Test.sol`. The merge brought them in untouched, which would have left the pin at 1.16.2 with five files still resolving against a remapping that no longer exists. `grep -rn 'forge-std-1\.16\.1' .` outside `dependencies/`, `out/` and `cache/` now returns zero hits. --- test/src/interface/IIntegrityToolingV1.t.sol | 2 +- test/src/interface/IOpcodeToolingV1.t.sol | 2 +- test/src/interface/IParserToolingV1.t.sol | 2 +- test/src/interface/ISubParserToolingV1.t.sol | 2 +- test/src/lib/LibCodeGen.commentPrefix.t.sol | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/src/interface/IIntegrityToolingV1.t.sol b/test/src/interface/IIntegrityToolingV1.t.sol index 6465e8b..bf91392 100644 --- a/test/src/interface/IIntegrityToolingV1.t.sol +++ b/test/src/interface/IIntegrityToolingV1.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test} from "forge-std-1.16.1/src/Test.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; import {IIntegrityToolingV1} from "src/interface/IIntegrityToolingV1.sol"; import {ToolingMock} from "test/concrete/ToolingMock.sol"; diff --git a/test/src/interface/IOpcodeToolingV1.t.sol b/test/src/interface/IOpcodeToolingV1.t.sol index 27c276d..bb37724 100644 --- a/test/src/interface/IOpcodeToolingV1.t.sol +++ b/test/src/interface/IOpcodeToolingV1.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test} from "forge-std-1.16.1/src/Test.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; import {IOpcodeToolingV1} from "src/interface/IOpcodeToolingV1.sol"; import {ToolingMock} from "test/concrete/ToolingMock.sol"; diff --git a/test/src/interface/IParserToolingV1.t.sol b/test/src/interface/IParserToolingV1.t.sol index a31e7f1..1aebff1 100644 --- a/test/src/interface/IParserToolingV1.t.sol +++ b/test/src/interface/IParserToolingV1.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test} from "forge-std-1.16.1/src/Test.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; import {IParserToolingV1} from "src/interface/IParserToolingV1.sol"; import {ToolingMock} from "test/concrete/ToolingMock.sol"; diff --git a/test/src/interface/ISubParserToolingV1.t.sol b/test/src/interface/ISubParserToolingV1.t.sol index ab9910b..fd607a6 100644 --- a/test/src/interface/ISubParserToolingV1.t.sol +++ b/test/src/interface/ISubParserToolingV1.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test} from "forge-std-1.16.1/src/Test.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; import {ISubParserToolingV1} from "src/interface/ISubParserToolingV1.sol"; import {ToolingMock} from "test/concrete/ToolingMock.sol"; diff --git a/test/src/lib/LibCodeGen.commentPrefix.t.sol b/test/src/lib/LibCodeGen.commentPrefix.t.sol index e123c94..e7bc33d 100644 --- a/test/src/lib/LibCodeGen.commentPrefix.t.sol +++ b/test/src/lib/LibCodeGen.commentPrefix.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test} from "forge-std-1.16.1/src/Test.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; import {LibCodeGen} from "src/lib/LibCodeGen.sol"; import {LibCodeGenSlow} from "test/lib/LibCodeGenSlow.sol";