space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Work around broken nullability.

Browse Source 
Revert "Fix nullability errors"

This reverts commit a7f31f9ebf.

Revert "NotNullWhen()"

This reverts commit b332644d48.

Work around broken nullability.
This commit is contained in:
Pieter-Jan Briers
2021-02-23 23:05:31 +01:00
parent 393c15c44a
commit 7a836d1018
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Robust.Shared/GameObjects/Components/Localization/GrammarComponent.cs
View File

@@ -29,7 +29,7 @@ namespace Robust.Shared.GameObjects.Components.Localization
if (serializer.TryReadDataFieldCached("gender", out string? gender0))
{
var refl = IoCManager.Resolve<IReflectionManager>();
if (refl.TryParseEnumReference(gender0, out var gender))
if (refl.TryParseEnumReference(gender0!, out var gender))
{
Gender = (Gender)gender;
}

6
Robust.Shared/Serialization/ObjectSerializer.cs
View File

@@ -298,18 +298,18 @@ namespace Robust.Shared.Serialization
return TryReadDataField(name, WithFormat<T>.NoFormat, out value);
}
public abstract bool TryReadDataField<T>(string name, WithFormat<T> format, [NotNullWhen(true)] out T value);
public abstract bool TryReadDataField<T>(string name, WithFormat<T> format, [MaybeNullWhen(false)] out T value);
/// <summary>
/// Try- pattern version of <see cref="ReadDataFieldCached" />.
/// </summary>
public virtual bool TryReadDataFieldCached<T>(string name, [NotNullWhen(true)] out T? value)
public virtual bool TryReadDataFieldCached<T>(string name, [MaybeNullWhen(false)] out T value)
{
return TryReadDataFieldCached(name, WithFormat<T>.NoFormat, out value);
}
public virtual bool TryReadDataFieldCached<T>(string name, WithFormat<T> format,
[NotNullWhen(true)] out T value)
[MaybeNullWhen(false)] out T value)
{
return TryReadDataField(name, format, out value);
}