From 9f0a8a84aacb87d23b2f7e43d0f7ade086e9ede0 Mon Sep 17 00:00:00 2001
From: yarashevich_kv <yarashevich_kv@st.by>
Date: Tue, 29 Jul 2025 09:39:35 +0300
Subject: [PATCH] impr: fix after rebase.

---
 cherrypick/example/bin/main.dart         | 1 -
 cherrypick/lib/src/binding_resolver.dart | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/cherrypick/example/bin/main.dart b/cherrypick/example/bin/main.dart
index 5d48e66..dff6cda 100644
--- a/cherrypick/example/bin/main.dart
+++ b/cherrypick/example/bin/main.dart
@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'package:cherrypick/cherrypick.dart';
-import 'package:meta/meta.dart';
 
 class AppModule extends Module {
   @override
diff --git a/cherrypick/lib/src/binding_resolver.dart b/cherrypick/lib/src/binding_resolver.dart
index d6b69ee..37c196b 100644
--- a/cherrypick/lib/src/binding_resolver.dart
+++ b/cherrypick/lib/src/binding_resolver.dart
@@ -39,7 +39,7 @@ class InstanceResolver<T> implements BindingResolver<T> {
 
   @override
   T resolveSync([_]) {
-    if (_instance is T) return _instance as T;
+    if (_instance is T) return _instance;
     throw StateError(
       'Instance $_instance is Future; '
       'use resolveAsync() instead',
@@ -48,9 +48,9 @@ class InstanceResolver<T> implements BindingResolver<T> {
 
   @override
   Future<T> resolveAsync([_]) {
-    if (_instance is Future<T>) return _instance as Future<T>;
-    if (_instance is T) return Future.value(_instance as T);
-    throw StateError('Unexpected instance type: $_instance');
+    if (_instance is Future<T>) return _instance;
+
+    return Future.value(_instance);
   }
 
   @override