Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit78d48f6

Browse files
dotnet-botKevinRansom
authored andcommitted
Merge master to dev15.8 (#4997)
* Fixing #4967 (#4968)* Fix internal error when compiling interface implementation lacking an overloaded method implementation - fixes #4967* Adding a test* Update E_OverloadMismatch.fs* Remove a setify + isSingleton combo (#4980)* remove a setify* Remove intermediate collection* Improve async stack traces (#4867)* very early prototype* async stack traces* async cleanup* minor fix* async cleanup* more async cleanup* integrate async-cleanup* async cleanup* fix build* more cleanup* minor fixes* minor fixes* full exception stacktraces* fix test* fix test* code review* cleanup naming* fix build* undo rethrow and integrate cleanup* apply renamings* Further cleanup in control.fs* add tests and add filtering TryWith, plus other cleanup* integrate cleanup* fix tests* test only runs on .net framework* slightly tweak primitives to be more suitable for later optimization* slightly tweak primitives to be more suitable for later optimization* update baselines* add check that no line 0 appear in stack* update baseline* use struct wrapper for async activation* simplify code* simplify code* update baselines* update baselines* fix baseline* remove dead code* simplify code* apply DebuggerHidden in a couple more places* [ RFC FS-1039] implementation of value options (#4837)* posible implementation of value options* fix surface area test* fix test* VNone --> ValueNone* fix surface area* fix build* update baselines* fix baselines* fix baselines* fix baselines* fix baselines* fix build
1 parentc574e8f commit78d48f6

File tree

29 files changed

+1716
-588
lines changed

29 files changed

+1716
-588
lines changed

‎src/absil/illib.fs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -448,16 +448,16 @@ module List =
448448

449449
[<Struct>]
450450
typeValueOption<'T>=
451-
|VSomeof'T
452-
|VNone
453-
memberx.IsSome=match xwithVSome_->true|VNone->false
454-
memberx.IsNone=match xwithVSome_->false|VNone->true
455-
memberx.Value=match xwithVSome r-> r|VNone-> failwith"ValueOption.Value: value is None"
451+
|ValueSomeof'T
452+
|ValueNone
453+
memberx.IsSome=match xwithValueSome_->true|ValueNone->false
454+
memberx.IsNone=match xwithValueSome_->false|ValueNone->true
455+
memberx.Value=match xwithValueSome r-> r|ValueNone-> failwith"ValueOption.Value: value is None"
456456

457457
[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
458458
moduleValueOption=
459-
let inlineofOption x=match xwith Some x->VSome x| None->VNone
460-
let inlinebind f x=match xwithVSome x-> f x|VNone->VNone
459+
let inlineofOption x=match xwith Some x->ValueSome x| None->ValueNone
460+
let inlinebind f x=match xwithValueSome x-> f x|ValueNone->ValueNone
461461

462462
moduleString=
463463
letindexNotFound()= raise(new KeyNotFoundException("An index for the character was not found in the string"))

‎src/fsharp/AttributeChecking.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,15 +511,15 @@ let IsSecurityAttribute (g: TcGlobals) amap (casmap : Dictionary<Stamp, bool>) (
511511
| None->false
512512
| Some attr->
513513
match attr.TyconRef.TryDerefwith
514-
|VSome_->
514+
|ValueSome_->
515515
lettcs= tcref.Stamp
516516
match casmap.TryGetValue(tcs)with
517517
|true, c-> c
518518
|_->
519519
letexists= ExistsInEntireHierarchyOfType(fun t-> typeEquiv g t(mkAppTy attr.TyconRef[])) g amap m AllowMultiIntfInstantiations.Yes(mkAppTy tcref[])
520520
casmap.[tcs]<- exists
521521
exists
522-
|VNone->false
522+
|ValueNone->false
523523

524524
letIsSecurityCriticalAttribute g(Attrib(tcref,_,_,_,_,_,_))=
525525
(tyconRefEq g tcref g.attrib_SecurityCriticalAttribute.TyconRef|| tyconRefEq g tcref g.attrib_SecuritySafeCriticalAttribute.TyconRef)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp