redundant private (#1381)

src/Humanizer.Tests.Shared/CollectionHumanizeTests.cs

@@ -56,7 +56,7 @@ public void HumanizeUsesOxfordComma()
             Assert.Equal("A String, Another String, or A Third String", collection.Humanize("or"));
         }
 
-        private readonly List<SomeClass> _testCollection =
+        readonly List<SomeClass> _testCollection =
         [
             new() { SomeInt = 1, SomeString = "One" },
             new() { SomeInt = 2, SomeString = "Two" },
@@ -126,6 +126,6 @@ public void HumanizeTrimsItemsByDefault() =>
         /// <summary>
         /// Use the dummy formatter to ensure tests are testing formatter output rather than input
         /// </summary>
-        private static readonly Func<string, string> dummyFormatter = input => input;
+        static readonly Func<string, string> dummyFormatter = input => input;
     }
 }

src/Humanizer.Tests.Shared/DateHumanize.cs

@@ -2,9 +2,9 @@
 {
     public class DateHumanize
     {
-        private static readonly object LockObject = new();
+        static readonly object LockObject = new();
 
-        private static void VerifyWithCurrentDate(string expectedString, TimeSpan deltaFromNow, CultureInfo culture)
+        static void VerifyWithCurrentDate(string expectedString, TimeSpan deltaFromNow, CultureInfo culture)
         {
             var utcNow = DateTime.UtcNow;
             var localNow = DateTime.Now;
@@ -13,15 +13,15 @@ private static void VerifyWithCurrentDate(string expectedString, TimeSpan deltaF
             VerifyWithDate(expectedString, deltaFromNow, culture, localNow, utcNow);
         }
 
-        private static void VerifyWithDateInjection(string expectedString, TimeSpan deltaFromNow, CultureInfo culture)
+        static void VerifyWithDateInjection(string expectedString, TimeSpan deltaFromNow, CultureInfo culture)
         {
             var utcNow = new DateTime(2013, 6, 20, 9, 58, 22, DateTimeKind.Utc);
             var now = new DateTime(2013, 6, 20, 11, 58, 22, DateTimeKind.Local);
 
             VerifyWithDate(expectedString, deltaFromNow, culture, now, utcNow);
         }
 
-        private static void VerifyWithDate(string expectedString, TimeSpan deltaFromBase, CultureInfo culture, DateTime baseDate, DateTime baseDateUtc)
+        static void VerifyWithDate(string expectedString, TimeSpan deltaFromBase, CultureInfo culture, DateTime baseDate, DateTime baseDateUtc)
         {
             Assert.Equal(expectedString, baseDateUtc.Add(deltaFromBase).Humanize(utcDate: true, dateToCompareAgainst: baseDateUtc, culture: culture));
             Assert.Equal(expectedString, baseDate.Add(deltaFromBase).Humanize(false, baseDate, culture: culture));

src/Humanizer.Tests.Shared/DateTimeHumanizePrecisionStrategyTests.cs

@@ -3,7 +3,7 @@
     [UseCulture("en-US")]
     public class DateTimeHumanizePrecisionStrategyTests
     {
-        private const double DefaultPrecision = .75;
+        const double DefaultPrecision = .75;
 
         [Theory]
         [InlineData(1, "now")]

src/Humanizer.Tests.Shared/DehumanizeToEnumTests.cs

@@ -80,7 +80,7 @@ public void HonorsLocalizedDisplayAttribute()
             Assert.Equal(EnumUnderTest.MemberWithLocalizedDisplayAttribute, EnumTestsResources.MemberWithLocalizedDisplayAttribute.DehumanizeTo(typeof(EnumUnderTest)));
         }
 
-        private struct DummyStructWithEnumInterfaces : IComparable, IFormattable
+        struct DummyStructWithEnumInterfaces : IComparable, IFormattable
         {
             public int CompareTo(object obj) =>
                 throw new NotImplementedException();
@@ -140,7 +140,7 @@ public object ToType(Type conversionType, IFormatProvider provider) =>
                 throw new NotImplementedException();
         }
 
-        private enum DummyEnum
+        enum DummyEnum
         {
             First,
             Second

src/Humanizer.Tests.Shared/StringExtensionsTests.cs

@@ -2,8 +2,8 @@
 {
     public class StringExtensionsTests
     {
-        private const string Format = "This is a format with three numbers: {0}-{1}-{2}.";
-        private const string Expected = "This is a format with three numbers: 1-2-3.";
+        const string Format = "This is a format with three numbers: {0}-{1}-{2}.";
+        const string Expected = "This is a format with three numbers: 1-2-3.";
 
         [Fact]
         public void CanFormatStringWithExactNumberOfArguments() =>

src/Humanizer.Tests.Shared/UseCultureAttribute.cs

@@ -11,10 +11,10 @@ namespace Humanizer.Tests
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
     public class UseCultureAttribute : BeforeAfterTestAttribute
     {
-        private readonly Lazy<CultureInfo> culture;
-        private readonly Lazy<CultureInfo> uiCulture;
-        private CultureInfo originalCulture;
-        private CultureInfo originalUICulture;
+        readonly Lazy<CultureInfo> culture;
+        readonly Lazy<CultureInfo> uiCulture;
+        CultureInfo originalCulture;
+        CultureInfo originalUICulture;
 
         /// <summary>
         /// Replaces the culture and UI culture of the current thread with

src/Humanizer/ArticlePrefixSort.cs

@@ -97,7 +97,7 @@ public static string[] PrependArticleSuffix(string[] appended)
             return inserted;
         }
 
-        private static string ToOriginalFormat(string[] appended, string suffix, int i)
+        static string ToOriginalFormat(string[] appended, string suffix, int i)
         {
             var insertion = appended[i].Remove(appended[i].IndexOf(suffix, StringComparison.CurrentCulture));
             var original = $"{suffix} {insertion}";

src/Humanizer/Bytes/ByteSize.cs

@@ -217,7 +217,7 @@ public string ToString(string format) =>
         public string ToString(string format, IFormatProvider provider) =>
             ToString(format, provider, toSymbol: true);
 
-        private string ToString(string format, IFormatProvider provider, bool toSymbol)
+        string ToString(string format, IFormatProvider provider, bool toSymbol)
         {
             if (format == null)
                 format = "G";
@@ -500,7 +500,7 @@ public static bool TryParse(string s, IFormatProvider formatProvider, out ByteSi
             return true;
         }
 
-        private static NumberFormatInfo GetNumberFormatInfo(IFormatProvider formatProvider)
+        static NumberFormatInfo GetNumberFormatInfo(IFormatProvider formatProvider)
         {
             if (formatProvider is NumberFormatInfo numberFormat)
                 return numberFormat;

src/Humanizer/Configuration/Configurator.cs

@@ -99,8 +99,8 @@ internal static INumberToWordsConverter GetNumberToWordsConverter(CultureInfo cu
         public static ITimeOnlyHumanizeStrategy TimeOnlyHumanizeStrategy { get; set; } = new DefaultTimeOnlyHumanizeStrategy();
 #endif
 
-        private static readonly Func<PropertyInfo, bool> DefaultEnumDescriptionPropertyLocator = p => p.Name == "Description";
-        private static Func<PropertyInfo, bool> _enumDescriptionPropertyLocator = DefaultEnumDescriptionPropertyLocator;
+        static readonly Func<PropertyInfo, bool> DefaultEnumDescriptionPropertyLocator = p => p.Name == "Description";
+        static Func<PropertyInfo, bool> _enumDescriptionPropertyLocator = DefaultEnumDescriptionPropertyLocator;
         /// <summary>
         /// A predicate function for description property of attribute to use for Enum.Humanize
         /// </summary>

src/Humanizer/Configuration/FormatterRegistry.cs

@@ -60,7 +60,7 @@ public FormatterRegistry() : base(new DefaultFormatter("en-US"))
             Register("lb", new LuxembourgishFormatter());
         }
 
-        private void RegisterDefaultFormatter(string localeCode)
+        void RegisterDefaultFormatter(string localeCode)
         {
             try
             {
@@ -72,7 +72,7 @@ private void RegisterDefaultFormatter(string localeCode)
             }
         }
 
-        private void RegisterCzechSlovakPolishFormatter(string localeCode) =>
+        void RegisterCzechSlovakPolishFormatter(string localeCode) =>
             Register(localeCode, new CzechSlovakPolishFormatter(localeCode));
     }
 }

src/Humanizer/Configuration/LocaliserRegistry.cs

@@ -7,8 +7,8 @@
     public class LocaliserRegistry<TLocaliser>
         where TLocaliser : class
     {
-        private readonly IDictionary<string, Func<CultureInfo, TLocaliser>> _localisers = new Dictionary<string, Func<CultureInfo, TLocaliser>>();
-        private readonly Func<CultureInfo, TLocaliser> _defaultLocaliser;
+        readonly IDictionary<string, Func<CultureInfo, TLocaliser>> _localisers = new Dictionary<string, Func<CultureInfo, TLocaliser>>();
+        readonly Func<CultureInfo, TLocaliser> _defaultLocaliser;
 
         /// <summary>
         /// Creates a localiser registry with the default localiser set to the provided value
@@ -47,7 +47,7 @@ public void Register(string localeCode, TLocaliser localiser) =>
         public void Register(string localeCode, Func<CultureInfo, TLocaliser> localiser) =>
             _localisers[localeCode] = localiser;
 
-        private Func<CultureInfo, TLocaliser> FindLocaliser(CultureInfo culture)
+        Func<CultureInfo, TLocaliser> FindLocaliser(CultureInfo culture)
         {
             for (var c = culture; !string.IsNullOrEmpty(c?.Name); c = c.Parent)
             {

src/Humanizer/DateTimeHumanizeStrategy/DateTimeHumanizeAlgorithms.cs

@@ -40,7 +40,7 @@ public static string PrecisionHumanize(TimeOnly input, TimeOnly comparisonBase,
             return PrecisionHumanize(ts, tense, precision, culture);
         }
 #endif
-        private static string PrecisionHumanize(TimeSpan ts, Tense tense, double precision, CultureInfo culture)
+        static string PrecisionHumanize(TimeSpan ts, Tense tense, double precision, CultureInfo culture)
         {
             int seconds = ts.Seconds, minutes = ts.Minutes, hours = ts.Hours, days = ts.Days;
             int years = 0, months = 0;
@@ -172,7 +172,7 @@ public static string DefaultHumanize(TimeOnly input, TimeOnly comparisonBase, Cu
         }
 #endif
 
-        private static string DefaultHumanize(TimeSpan ts, bool sameMonth, int days, Tense tense, CultureInfo culture)
+        static string DefaultHumanize(TimeSpan ts, bool sameMonth, int days, Tense tense, CultureInfo culture)
         {
             var formatter = Configurator.GetFormatter(culture);
 

src/Humanizer/DateTimeHumanizeStrategy/PrecisionDateOnlyHumanizeStrategy.cs

@@ -7,7 +7,7 @@ namespace Humanizer
     /// </summary>
     public class PrecisionDateOnlyHumanizeStrategy : IDateOnlyHumanizeStrategy
     {
-        private readonly double _precision;
+        readonly double _precision;
 
         /// <summary>
         /// Constructs a precision-based calculator for distance of time with default precision 0.75.

src/Humanizer/DateTimeHumanizeStrategy/PrecisionDateTimeHumanizeStrategy.cs

@@ -5,7 +5,7 @@ namespace Humanizer
     /// </summary>
     public class PrecisionDateTimeHumanizeStrategy : IDateTimeHumanizeStrategy
     {
-        private readonly double _precision;
+        readonly double _precision;
 
         /// <summary>
         /// Constructs a precision-based calculator for distance of time with default precision 0.75.

src/Humanizer/DateTimeHumanizeStrategy/PrecisionDateTimeOffsetHumanizeStrategy.cs

@@ -5,7 +5,7 @@ namespace Humanizer
     /// </summary>
     public class PrecisionDateTimeOffsetHumanizeStrategy : IDateTimeOffsetHumanizeStrategy
     {
-        private readonly double _precision;
+        readonly double _precision;
 
         /// <summary>
         /// Constructs a precision-based calculator for distance of time with default precision 0.75.

src/Humanizer/DateTimeHumanizeStrategy/PrecisionTimeOnlyHumanizeStrategy.cs

@@ -7,7 +7,7 @@ namespace Humanizer
     /// </summary>
     public class PrecisionTimeOnlyHumanizeStrategy : ITimeOnlyHumanizeStrategy
     {
-        private readonly double _precision;
+        readonly double _precision;
 
         /// <summary>
         /// Constructs a precision-based calculator for distance of time with default precision 0.75.

src/Humanizer/EnumDehumanizeExtensions.cs

@@ -27,7 +27,7 @@ public static TTargetEnum DehumanizeTo<TTargetEnum>(this string input)
         public static Enum DehumanizeTo(this string input, Type targetEnum, OnNoMatch onNoMatch = OnNoMatch.ThrowsException) =>
             (Enum)DehumanizeToPrivate(input, targetEnum, onNoMatch);
 
-        private static object DehumanizeToPrivate(string input, Type targetEnum, OnNoMatch onNoMatch)
+        static object DehumanizeToPrivate(string input, Type targetEnum, OnNoMatch onNoMatch)
         {
             var match = Enum.GetValues(targetEnum).Cast<Enum>().FirstOrDefault(value => string.Equals(value.Humanize(), input, StringComparison.OrdinalIgnoreCase));
 

src/Humanizer/EnumHumanizeExtensions.cs

@@ -45,10 +45,10 @@ public static string Humanize(this Enum input)
         /// Checks whether the given enum is to be used as a bit field type.
         /// </summary>
         /// <returns>True if the given enum is a bit field enum, false otherwise.</returns>
-        private static bool IsBitFieldEnum(Type type) =>
+        static bool IsBitFieldEnum(Type type) =>
             type.GetCustomAttribute(typeof(FlagsAttribute)) != null;
 
-        private static string GetCustomDescription(MemberInfo memberInfo)
+        static string GetCustomDescription(MemberInfo memberInfo)
         {
             var displayAttribute = memberInfo.GetCustomAttribute<DisplayAttribute>();
             if (displayAttribute != null)

src/Humanizer/Inflections/Vocabularies.cs

@@ -5,7 +5,7 @@
     /// </summary>
     public static class Vocabularies
     {
-        private static readonly Lazy<Vocabulary> Instance;
+        static readonly Lazy<Vocabulary> Instance;
 
         static Vocabularies() =>
             Instance = new(BuildDefault, LazyThreadSafetyMode.PublicationOnly);
@@ -17,7 +17,7 @@ static Vocabularies() =>
         /// </summary>
         public static Vocabulary Default => Instance.Value;
 
-        private static Vocabulary BuildDefault()
+        static Vocabulary BuildDefault()
         {
             var _default = new Vocabulary();
 

src/Humanizer/Inflections/Vocabulary.cs

@@ -187,7 +187,7 @@ string LetterS(string word)
 
     class Rule(string pattern, string replacement)
     {
-        private readonly Regex regex = new(pattern, RegexOptions.IgnoreCase | RegexOptionsUtil.Compiled);
+        readonly Regex regex = new(pattern, RegexOptions.IgnoreCase | RegexOptionsUtil.Compiled);
 
         public string Apply(string word)
         {

src/Humanizer/Localisation/CollectionFormatters/DefaultCollectionFormatter.cs

@@ -53,7 +53,7 @@ public string Humanize<T>(IEnumerable<T> collection, Func<T, object> objectForma
                 separator);
         }
 
-        private string HumanizeDisplayStrings(IEnumerable<string> strings, string separator)
+        string HumanizeDisplayStrings(IEnumerable<string> strings, string separator)
         {
             var itemsArray = strings
                 .Select(item => item == null ? string.Empty : item.Trim())

src/Humanizer/Localisation/Formatters/ArabicFormatter.cs

@@ -3,8 +3,8 @@
     class ArabicFormatter() :
         DefaultFormatter("ar")
     {
-        private const string DualPostfix = "_Dual";
-        private const string PluralPostfix = "_Plural";
+        const string DualPostfix = "_Dual";
+        const string PluralPostfix = "_Plural";
 
         protected override string GetResourceKey(string resourceKey, int number)
         {

src/Humanizer/Localisation/Formatters/CroatianFormatter.cs

@@ -3,7 +3,7 @@ namespace Humanizer
     class CroatianFormatter() :
         DefaultFormatter("hr")
     {
-        private const string DualTrialQuadralPostfix = "_DualTrialQuadral";
+        const string DualTrialQuadralPostfix = "_DualTrialQuadral";
 
         protected override string GetResourceKey(string resourceKey, int number)
         {

src/Humanizer/Localisation/Formatters/CzechSlovakPolishFormatter.cs

@@ -3,7 +3,7 @@
     class CzechSlovakPolishFormatter(string localeCode) :
         DefaultFormatter(localeCode)
     {
-        private const string PaucalPostfix = "_Paucal";
+        const string PaucalPostfix = "_Paucal";
 
         protected override string GetResourceKey(string resourceKey, int number)
         {

src/Humanizer/Localisation/Formatters/DefaultFormatter.cs

@@ -5,7 +5,7 @@
     /// </summary>
     public class DefaultFormatter : IFormatter
     {
-        private readonly CultureInfo _culture;
+        readonly CultureInfo _culture;
 
         /// <summary>
         /// Constructor.
@@ -68,13 +68,13 @@ public virtual string TimeUnitHumanize(TimeUnit timeUnit)
             return Format(resourceKey);
         }
 
-        private string GetResourceForDate(TimeUnit unit, Tense timeUnitTense, int count)
+        string GetResourceForDate(TimeUnit unit, Tense timeUnitTense, int count)
         {
             var resourceKey = ResourceKeys.DateHumanize.GetResourceKey(unit, timeUnitTense: timeUnitTense, count: count);
             return count == 1 ? Format(resourceKey) : Format(resourceKey, count);
         }
 
-        private string GetResourceForTimeSpan(TimeUnit unit, int count, bool toWords = false)
+        string GetResourceForTimeSpan(TimeUnit unit, int count, bool toWords = false)
         {
             var resourceKey = ResourceKeys.TimeSpanHumanize.GetResourceKey(unit, count, toWords);
             return count == 1 ? Format(resourceKey + (toWords ? "_Words" : "")) : Format(resourceKey, count, toWords);

src/Humanizer/Localisation/Formatters/FrenchFormatter.cs

@@ -3,7 +3,7 @@
     class FrenchFormatter(string localeCode) :
         DefaultFormatter(localeCode)
     {
-        private const string DualPostfix = "_Dual";
+        const string DualPostfix = "_Dual";
 
         protected override string GetResourceKey(string resourceKey, int number)
         {

src/Humanizer/Localisation/Formatters/HebrewFormatter.cs

@@ -3,8 +3,8 @@
     class HebrewFormatter() :
         DefaultFormatter("he")
     {
-        private const string DualPostfix = "_Dual";
-        private const string PluralPostfix = "_Plural";
+        const string DualPostfix = "_Dual";
+        const string PluralPostfix = "_Plural";
 
         protected override string GetResourceKey(string resourceKey, int number)
         {

src/Humanizer/Localisation/Formatters/IcelandicFormatter.cs

@@ -3,8 +3,8 @@
     class IcelandicFormatter() :
         DefaultFormatter(LocaleCode)
     {
-        private const string LocaleCode = "is";
-        private readonly CultureInfo _localCulture = new(LocaleCode);
+        const string LocaleCode = "is";
+        readonly CultureInfo _localCulture = new(LocaleCode);
 
         public override string DataUnitHumanize(DataUnit dataUnit, double count, bool toSymbol = true) =>
             base.DataUnitHumanize(dataUnit, count, toSymbol)?.TrimEnd('s');

src/Humanizer/Localisation/Formatters/LithuanianFormatter.cs

@@ -15,7 +15,7 @@ protected override string GetResourceKey(string resourceKey, int number)
             return resourceKey + suffix;
         }
 
-        private static string GetSuffix(LithuanianNumberForm form)
+        static string GetSuffix(LithuanianNumberForm form)
         {
             if (form == LithuanianNumberForm.Singular)
             {

src/Humanizer/Localisation/Formatters/MalteseFormatter.cs

@@ -3,9 +3,9 @@
     class MalteseFormatter(string localeCode) :
         DefaultFormatter(localeCode)
     {
-        private const string DualPostfix = "_Dual";
+        const string DualPostfix = "_Dual";
 
-        private static readonly string[] DualResourceKeys =
+        static readonly string[] DualResourceKeys =
         [
             "DateHumanize_MultipleDaysAgo", "DateHumanize_MultipleDaysFromNow", "DateHumanize_MultipleHoursAgo", "DateHumanize_MultipleHoursFromNow" ,
             "DateHumanize_MultipleMonthsAgo", "DateHumanize_MultipleMonthsFromNow", "DateHumanize_MultipleYearsAgo", "DateHumanize_MultipleYearsFromNow",