Fixed linter issue and removed escaping of forward slashes (ref: #5251)

OpenZeppelin · Feb 20, 2025 · c7ab6c0 · c7ab6c0
1 parent 5bfb4cf
commit c7ab6c0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/contracts/utils/Strings.sol b/contracts/utils/Strings.sol
@@ -22,7 +22,6 @@ library Strings {
             (1 << 0x0c) | // form feed
             (1 << 0x0d) | // carriage return
             (1 << 0x22) | // double quote
-            (1 << 0x2f) | // forward slash
             (1 << 0x5c); // backslash
 
     /**
@@ -446,20 +445,24 @@ library Strings {
         for (uint256 i; i < buffer.length; ++i) {
             bytes1 char = buffer[i];
             if (((SPECIAL_CHARS_LOOKUP & (1 << uint8(char))) != 0)) {
-                output[outputLength++] = "\\";
-                if (char == 0x08) output[outputLength++] = "b";
-                else if (char == 0x09) output[outputLength++] = "t";
-                else if (char == 0x0A) output[outputLength++] = "n";
-                else if (char == 0x0C) output[outputLength++] = "f";
-                else if (char == 0x0D) output[outputLength++] = "r";
-                else if (char == 0x22) output[outputLength++] = '"';
-                else if (char == 0x2F) output[outputLength++] = "/";
-                else if (char == 0x5C) output[outputLength++] = "\\";
+                output[outputLength++] = bytes1(uint8(0x5C)); // backslash
+                if (char == 0x08)
+                    output[outputLength++] = bytes1(uint8(0x62)); // b
+                else if (char == 0x09)
+                    output[outputLength++] = bytes1(uint8(0x74)); // t
+                else if (char == 0x0A)
+                    output[outputLength++] = bytes1(uint8(0x6E)); // n
+                else if (char == 0x0C)
+                    output[outputLength++] = bytes1(uint8(0x66)); // f
+                else if (char == 0x0D)
+                    output[outputLength++] = bytes1(uint8(0x72)); // r
+                else if (char == 0x22)
+                    output[outputLength++] = bytes1(uint8(0x22)); // "
+                else if (char == 0x5C) output[outputLength++] = bytes1(uint8(0x5C)); // \
             } else {
                 output[outputLength++] = char;
             }
         }
-
         // write the actual length and deallocate unused memory
         assembly ("memory-safe") {
             mstore(output, outputLength)

diff --git a/lib/erc4626-tests b/lib/erc4626-tests
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/halmos-cheatcodes b/lib/halmos-cheatcodes
+1 −1		README.md
+0 −2		foundry.toml
+1 −1		package.json
+0 −24		src/StdChains.sol
+2 −14		src/StdCheats.sol
+17 −0		src/StdUtils.sol
+13 −198		src/Vm.sol
+234 −0		src/mocks/MockERC20.sol
+231 −0		src/mocks/MockERC721.sol
+4 −0		test/StdAssertions.t.sol
+6 −5		test/StdChains.t.sol
+3 −20		test/StdStorage.t.sol
+2 −2		test/Vm.t.sol
+441 −0		test/mocks/MockERC20.t.sol
+721 −0		test/mocks/MockERC721.t.sol