Skip to content

[DependencyInjection] Use '==' instead of 'Equals()` to test service type equality #90334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benjaminpetit merged 1 commit into from
Aug 14, 2023
Merged

[DependencyInjection] Use '==' instead of 'Equals()` to test service type equality #90334

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/ServiceIdentifier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ public bool Equals(ServiceIdentifier other)
{
if (ServiceKey == null && other.ServiceKey == null)
{
return ServiceType.Equals(other.ServiceType);
return ServiceType == other.ServiceType;

@jkotas jkotas Aug 10, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

operator== is overloaded for System.Type and it just forwards the call to Equals unless the type is RuntimeType: https://github.com/dotnet/runtime/blob/main/src/libraries/System.Private.CoreLib/src/System/Type.cs#L654-L666

Is it actually fixing anything?

@benjaminpetit benjaminpetit Aug 11, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As long as you are trying to compare RuntimeType against DecoratedType at least.

The comment

// If `left` is a non-runtime type with a weird Equals implementation
// this is where operator `==` would differ from `Equals` call.

seems to indicate that someone else already experienced that...

@steveharter steveharter Aug 14, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add a test for this?

}
else if (ServiceKey != null && other.ServiceKey != null)
{
return ServiceType.Equals(other.ServiceType) && ServiceKey.Equals(other.ServiceKey);
return ServiceType == other.ServiceType && ServiceKey.Equals(other.ServiceKey);
}
return false;
}
Expand Down