cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10365 from ethereum/breaking-fix

Browse Source 
Fix test failures due to merge conflict (from develop to breaking)
This commit is contained in:
Alex Beregszaszi 2020-11-20 18:55:08 +00:00 committed by GitHub
commit 60fa3bfa2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/libsolidity/semanticTests/libraries/library_address_via_module.sol
View File

@ -55,6 +55,6 @@ contract C {
// j(uint256): 1 -> 1 // j(uint256): 1 -> 1
// j(uint256): 2 -> 4 // j(uint256): 2 -> 4
// j(uint256): 4 -> 16 // j(uint256): 4 -> 16
// k(uint256): 1 -> FAILURE // k(uint256): 1 -> FAILURE, hex"4e487b71", 0x01
// k(uint256): 2 -> FAILURE // k(uint256): 2 -> FAILURE, hex"4e487b71", 0x01
// k(uint256): 4 -> FAILURE // k(uint256): 4 -> FAILURE, hex"4e487b71", 0x01

2
test/libsolidity/syntaxTests/types/address/super_to_address.sol
View File

@ -4,4 +4,4 @@ contract C {
} }
} }
// ---- // ----
// TypeError 9640: (52-66): Explicit type conversion not allowed from "contract super C" to "address". // TypeError 9640: (52-66): Explicit type conversion not allowed from "type(contract super C)" to "address".