NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit8a20620

committed

cleanup

1 parent8bc97bc commit8a20620Copy full SHA for 8a20620

File tree

1 file changed

-5

lines changed

src/fsharp
- ConstraintSolver.fs

1 file changed

-5

lines changed

`‎src/fsharp/ConstraintSolver.fs‎`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -2225,7 +2225,8 @@ and ResolveOverloading`
`2225`	`2225`	`\|[]->`
`2226`	`2226`	`// OK, we failed. Collect up the errors from overload resolution and the possible overloads`
`2227`	`2227`	`leterrors=`
`2228`		`-(candidates\|> List.choose(fun calledMeth->`
	`2228`	`+ candidates`
	`2229`	`+\|> List.choose(fun calledMeth->`
`2229`	`2230`	`match CollectThenUndo(fun newTrace->`
`2230`	`2231`	`letcxsln= Option.map(fun traitInfo->(traitInfo, MemberConstraintSolutionOfMethInfo csenv.SolverState m calledMeth.Method calledMeth.CalledTyArgs)) cx`
`2231`	`2232`	`CanMemberSigsMatchUpToCheck`
`@@ -2238,7 +2239,7 @@ and ResolveOverloading`
`2238`	`2239`	`reqdRetTyOpt`
`2239`	`2240`	`calledMeth)with`
`2240`	`2241`	`\| OkResult_-> None`
`2241`		`-\| ErrorResult(_,exn)-> Some(calledMeth, exn)))`
	`2242`	`+\| ErrorResult(_,exn)-> Some(calledMeth, exn))`
`2242`	`2243`
`2243`	`2244`	`None,ErrorD(failOverloading(FSComp.SR.csNoOverloadsFound methodName) errors), NoTrace`
`2244`	`2245`
`@@ -2310,10 +2311,9 @@ and ResolveOverloading`
`2310`	`2311`
`2311`	`2312`	`// check regular args. The argument counts will only be different if one is using param args`
`2312`	`2313`	`letc=`
`2313`		`-if(candidate.TotalNumUnnamedCalledArgs= other.TotalNumUnnamedCalledArgs)then`
`2314`		`-`
	`2314`	`+if candidate.TotalNumUnnamedCalledArgs= other.TotalNumUnnamedCalledArgsthen`
`2315`	`2315`	`// For extension members, we also include the object argument type, if any in the comparison set`
`2316`		`-//THis matches C#, where all extension members are treated and resolved as "static" methods calls`
	`2316`	`+//This matches C#, where all extension members are treated and resolved as "static" methods calls`
`2317`	`2317`	`letcs=`
`2318`	`2318`	`(if candidate.Method.IsExtensionMember&& other.Method.IsExtensionMemberthen`
`2319`	`2319`	`letobjArgTys1= candidate.CalledObjArgTys(m)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit8a20620

File tree

1 file changed

1 file changed

`‎src/fsharp/ConstraintSolver.fs‎`

0 commit comments