Skip to content

Commit 6b1a06b

Browse files
Revert "Merge pull request #1202 from ArminShoeibi/feat/file-scoped-namespaces"
This reverts commit 1713f50, reversing changes made to f8c7b9d. It's a nice feature but it makes it impossible to backport things from main to 7.x and 6.x unless those branches also adopt it. So file-scoped namespaces are not necessary worth the backporting pain for library maintainers. Conflicts: projects/RabbitMQ.Client/client/api/DefaultEndpointResolver.cs projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.Recording.cs projects/RabbitMQ.Client/client/impl/SocketFrameHandler.cs
1 parent 531f0e6 commit 6b1a06b

File tree

198 files changed

+11710
-11514
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+11710
-11514
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
using System.Collections.Generic;
22

3-
namespace RabbitMQ;
3+
namespace RabbitMQ
4+
{
45
#nullable enable
56
#if NETSTANDARD
6-
internal static class DictionaryExtension
7-
{
8-
public static bool Remove<TKey, TValue>(this Dictionary<TKey, TValue> dictionary, TKey key, out TValue value)
7+
internal static class DictionaryExtension
98
{
10-
return dictionary.TryGetValue(key, out value) && dictionary.Remove(key);
9+
public static bool Remove<TKey, TValue>(this Dictionary<TKey, TValue> dictionary, TKey key, out TValue value)
10+
{
11+
return dictionary.TryGetValue(key, out value) && dictionary.Remove(key);
12+
}
1113
}
12-
}
1314
#endif
15+
}
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
using System;
22

3-
namespace RabbitMQ;
3+
namespace RabbitMQ
4+
{
45
#nullable enable
56
#if NETSTANDARD
6-
internal static class StringExtension
7-
{
8-
public static bool Contains(this string toSearch, string value, StringComparison comparisonType)
7+
internal static class StringExtension
98
{
10-
return toSearch.IndexOf(value, comparisonType) > 0;
9+
public static bool Contains(this string toSearch, string value, StringComparison comparisonType)
10+
{
11+
return toSearch.IndexOf(value, comparisonType) > 0;
12+
}
1113
}
12-
}
1314
#endif
15+
}

0 commit comments

Comments
 (0)