style: stricter linting

2025-05-05 04:39:07 -04:00 · 2021-10-23 12:31:18 +03:00 · 2021-10-23 12:31:18 +03:00 · 4717aab57f
commit 4717aab57f
parent f3fbc80f8e
84 changed files with 773 additions and 653 deletions
--- a/lib/src/bindings/attr.dart
+++ b/lib/src/bindings/attr.dart
@ -1,7 +1,7 @@
 import 'dart:ffi';
 import 'package:ffi/ffi.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Look up the value of one git attribute for path.
 ///
--- a/lib/src/bindings/blame.dart
+++ b/lib/src/bindings/blame.dart
@ -1,9 +1,9 @@
 import 'dart:ffi';
 import 'package:ffi/ffi.dart';
-import '../error.dart';
-import '../oid.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/oid.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Get the blame for a single file.
 ///
--- a/lib/src/bindings/blob.dart
+++ b/lib/src/bindings/blob.dart
@ -2,9 +2,9 @@ import 'dart:ffi';

 import 'package:ffi/ffi.dart';

-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Lookup a blob object from a repository.
 ///
@ -33,7 +33,7 @@ Pointer<git_oid> id(Pointer<git_blob> blob) => libgit2.git_blob_id(blob);
 /// Searching for NUL bytes and looking for a reasonable ratio of printable to
 /// non-printable characters among the first 8000 bytes.
 bool isBinary(Pointer<git_blob> blob) {
-  return libgit2.git_blob_is_binary(blob) == 1 ? true : false;
+  return libgit2.git_blob_is_binary(blob) == 1 || false;
 }

 /// Get a read-only buffer with the raw content of a blob.
--- a/lib/src/bindings/branch.dart
+++ b/lib/src/bindings/branch.dart
@ -2,11 +2,10 @@ import 'dart:ffi';

 import 'package:ffi/ffi.dart';
 import 'package:libgit2dart/libgit2dart.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
-import 'reference.dart' as reference_bindings;
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/reference.dart' as reference_bindings;
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Return a list of branches.
 ///
@ -27,7 +26,7 @@ List<Pointer<git_reference>> list({
    throw LibGit2Error(libgit2.git_error_last());
  }

-  var result = <Pointer<git_reference>>[];
+  final result = <Pointer<git_reference>>[];
  var error = 0;

  while (error == 0) {
@ -163,7 +162,7 @@ bool isHead(Pointer<git_reference> branch) {
  if (result < 0) {
    throw LibGit2Error(libgit2.git_error_last());
  } else {
-    return result == 1 ? true : false;
+    return result == 1 || false;
  }
 }

@ -179,7 +178,7 @@ bool isCheckedOut(Pointer<git_reference> branch) {
  if (result < 0) {
    throw LibGit2Error(libgit2.git_error_last());
  } else {
-    return result == 1 ? true : false;
+    return result == 1 || false;
  }
 }

--- a/lib/src/bindings/checkout.dart
+++ b/lib/src/bindings/checkout.dart
@ -1,10 +1,9 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Updates files in the index and the working tree to match the content of the
 /// commit pointed at by HEAD.
--- a/lib/src/bindings/commit.dart
+++ b/lib/src/bindings/commit.dart
@ -1,10 +1,9 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Lookup a commit object from a repository.
 ///
--- a/lib/src/bindings/config.dart
+++ b/lib/src/bindings/config.dart
@ -3,10 +3,9 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Create a new config instance containing a single on-disk file
 Pointer<git_config> open(String path) {
--- a/lib/src/bindings/credentials.dart
+++ b/lib/src/bindings/credentials.dart
@ -1,7 +1,8 @@
 import 'dart:ffi';
+
 import 'package:ffi/ffi.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Create a new plain-text username and password credential object.
 Pointer<git_credential> userPass({
--- a/lib/src/bindings/describe.dart
+++ b/lib/src/bindings/describe.dart
@ -1,10 +1,9 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Describe a commit.
 ///
--- a/lib/src/bindings/diff.dart
+++ b/lib/src/bindings/diff.dart
@ -1,10 +1,9 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Create a diff between the repository index and the workdir directory.
 Pointer<git_diff> indexToWorkdir({
--- a/lib/src/bindings/graph.dart
+++ b/lib/src/bindings/graph.dart
@ -1,10 +1,9 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Determine if a commit is the descendant of another commit.
 ///
@ -26,7 +25,7 @@ bool descendantOf({
  if (result < 0) {
    throw LibGit2Error(libgit2.git_error_last());
  } else {
-    return result == 1 ? true : false;
+    return result == 1 || false;
  }
 }

--- a/lib/src/bindings/index.dart
+++ b/lib/src/bindings/index.dart
@ -1,10 +1,9 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Update the contents of an existing index object in memory by reading from
 /// the hard disk.
@ -88,7 +87,7 @@ bool find({required Pointer<git_index> indexPointer, required String path}) {

  calloc.free(pathC);

-  return result == git_error_code.GIT_ENOTFOUND ? false : true;
+  return result != git_error_code.GIT_ENOTFOUND || false;
 }

 /// Get the count of entries currently in the index.
@ -209,7 +208,7 @@ void addAll({
  required Pointer<git_index> indexPointer,
  required List<String> pathspec,
 }) {
-  var pathspecC = calloc<git_strarray>();
+  final pathspecC = calloc<git_strarray>();
  final pathPointers =
      pathspec.map((e) => e.toNativeUtf8().cast<Int8>()).toList();
  final strArray = calloc<Pointer<Int8>>(pathspec.length);
@ -290,7 +289,7 @@ void removeAll({

 /// Determine if the index contains entries representing file conflicts.
 bool hasConflicts(Pointer<git_index> index) {
-  return libgit2.git_index_has_conflicts(index) == 1 ? true : false;
+  return libgit2.git_index_has_conflicts(index) == 1 || false;
 }

 /// Return list of conflicts in the index.
@ -302,7 +301,7 @@ List<Map<String, Pointer<git_index_entry>>> conflictList(
  final iterator = calloc<Pointer<git_index_conflict_iterator>>();
  libgit2.git_index_conflict_iterator_new(iterator, index);

-  var result = <Map<String, Pointer<git_index_entry>>>[];
+  final result = <Map<String, Pointer<git_index_entry>>>[];
  var error = 0;

  while (error >= 0) {
--- a/lib/src/bindings/mailmap.dart
+++ b/lib/src/bindings/mailmap.dart
@ -1,10 +1,9 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Allocate a new mailmap object.
 ///
--- a/lib/src/bindings/merge.dart
+++ b/lib/src/bindings/merge.dart
@ -1,10 +1,9 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Find a merge base between two commits.
 ///
--- a/lib/src/bindings/note.dart
+++ b/lib/src/bindings/note.dart
@ -1,8 +1,9 @@
 import 'dart:ffi';
+
 import 'package:ffi/ffi.dart';
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Returns list of notes for repository.
 ///
@ -19,12 +20,12 @@ List<Map<String, Pointer>> list(Pointer<git_repository> repo) {
    throw LibGit2Error(libgit2.git_error_last());
  }

-  var result = <Map<String, Pointer>>[];
+  final result = <Map<String, Pointer>>[];
  var nextError = 0;

  while (nextError >= 0) {
    final noteOid = calloc<git_oid>();
-    var annotatedOid = calloc<git_oid>();
+    final annotatedOid = calloc<git_oid>();
    nextError = libgit2.git_note_next(noteOid, annotatedOid, iterator.value);
    if (nextError >= 0) {
      final out = calloc<Pointer<git_note>>();
--- a/lib/src/bindings/object.dart
+++ b/lib/src/bindings/object.dart
@ -1,10 +1,9 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Get the object type of an object.
 int type(Pointer<git_object> obj) => libgit2.git_object_type(obj);
--- a/lib/src/bindings/odb.dart
+++ b/lib/src/bindings/odb.dart
@ -1,12 +1,11 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../error.dart';
-import '../oid.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
-import 'oid.dart' as oid_bindings;
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/oid.dart' as oid_bindings;
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/oid.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Create a new object database with no backends.
 ///
@ -66,7 +65,7 @@ bool exists({
  required Pointer<git_odb> odbPointer,
  required Pointer<git_oid> oidPointer,
 }) {
-  return libgit2.git_odb_exists(odbPointer, oidPointer) == 1 ? true : false;
+  return libgit2.git_odb_exists(odbPointer, oidPointer) == 1 || false;
 }

 /// List of objects in the database.
@ -91,7 +90,9 @@ List<Oid> objects(Pointer<git_odb> odb) {
  const except = -1;
  final cb =
      Pointer.fromFunction<Int32 Function(Pointer<git_oid>, Pointer<Void>)>(
-          _forEachCb, except);
+    _forEachCb,
+    except,
+  );
  final error = libgit2.git_odb_foreach(odb, cb, nullptr);

  if (error < 0) {
--- a/lib/src/bindings/oid.dart
+++ b/lib/src/bindings/oid.dart
@ -1,9 +1,8 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Parse N characters of a hex formatted object id into a git_oid.
 Pointer<git_oid> fromStrN(String hex) {
@ -30,7 +29,7 @@ Pointer<git_oid> fromSHA(String hex) {
 /// Copy an already raw oid into a git_oid structure.
 Pointer<git_oid> fromRaw(Array<Uint8> raw) {
  final out = calloc<git_oid>();
-  var rawC = calloc<Uint8>(20);
+  final rawC = calloc<Uint8>(20);

  for (var i = 0; i < 20; i++) {
    rawC[i] = raw[i];
--- a/lib/src/bindings/packbuilder.dart
+++ b/lib/src/bindings/packbuilder.dart
@ -1,10 +1,9 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Initialize a new packbuilder.
 ///
--- a/lib/src/bindings/patch.dart
+++ b/lib/src/bindings/patch.dart
@ -1,10 +1,9 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Directly generate a patch from the difference between two buffers.
 ///
--- a/lib/src/bindings/rebase.dart
+++ b/lib/src/bindings/rebase.dart
@ -1,10 +1,9 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Initializes a rebase operation to rebase the changes in [branchPointer]
 /// relative to [upstreamPointer] onto [ontoPointer] another branch. To begin
--- a/lib/src/bindings/refdb.dart
+++ b/lib/src/bindings/refdb.dart
@ -1,7 +1,7 @@
 import 'dart:ffi';

-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Suggests that the given refdb compress or optimize its references.
 /// This mechanism is implementation specific. For on-disk reference databases,
--- a/lib/src/bindings/reference.dart
+++ b/lib/src/bindings/reference.dart
@ -1,10 +1,9 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Get the type of a reference.
 ///
@ -126,16 +125,17 @@ Pointer<git_reference> rename({
 ///
 /// Throws a [LibGit2Error] if error occured.
 List<String> list(Pointer<git_repository> repo) {
-  var array = calloc<git_strarray>();
+  final array = calloc<git_strarray>();
  final error = libgit2.git_reference_list(array, repo);
-  var result = <String>[];
+  final result = <String>[];

  if (error < 0) {
    throw LibGit2Error(libgit2.git_error_last());
  } else {
    for (var i = 0; i < array.ref.count; i++) {
      result.add(
-          array.ref.strings.elementAt(i).value.cast<Utf8>().toDartString());
+        array.ref.strings.elementAt(i).value.cast<Utf8>().toDartString(),
+      );
    }
  }

@ -154,27 +154,27 @@ bool hasLog({

  calloc.free(refname);

-  return result == 1 ? true : false;
+  return result == 1 || false;
 }

 /// Check if a reference is a local branch.
 bool isBranch(Pointer<git_reference> ref) {
-  return libgit2.git_reference_is_branch(ref) == 1 ? true : false;
+  return libgit2.git_reference_is_branch(ref) == 1 || false;
 }

 /// Check if a reference is a note.
 bool isNote(Pointer<git_reference> ref) {
-  return libgit2.git_reference_is_note(ref) == 1 ? true : false;
+  return libgit2.git_reference_is_note(ref) == 1 || false;
 }

 /// Check if a reference is a remote tracking branch.
 bool isRemote(Pointer<git_reference> ref) {
-  return libgit2.git_reference_is_remote(ref) == 1 ? true : false;
+  return libgit2.git_reference_is_remote(ref) == 1 || false;
 }

 /// Check if a reference is a tag.
 bool isTag(Pointer<git_reference> ref) {
-  return libgit2.git_reference_is_tag(ref) == 1 ? true : false;
+  return libgit2.git_reference_is_tag(ref) == 1 || false;
 }

 /// Create a new direct reference.
@ -383,9 +383,7 @@ bool compare({
  required Pointer<git_reference> ref1Pointer,
  required Pointer<git_reference> ref2Pointer,
 }) {
-  return libgit2.git_reference_cmp(ref1Pointer, ref2Pointer) == 0
-      ? true
-      : false;
+  return libgit2.git_reference_cmp(ref1Pointer, ref2Pointer) == 0 || false;
 }

 /// Recursively peel reference until object of the specified type is found.
--- a/lib/src/bindings/reflog.dart
+++ b/lib/src/bindings/reflog.dart
@ -1,9 +1,8 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Read the reflog for the given reference.
 ///
--- a/lib/src/bindings/refspec.dart
+++ b/lib/src/bindings/refspec.dart
@ -1,10 +1,9 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Get the source specifier.
 String source(Pointer<git_refspec> refspec) {
@ -18,7 +17,7 @@ String destination(Pointer<git_refspec> refspec) {

 /// Get the force update setting.
 bool force(Pointer<git_refspec> refspec) {
-  return libgit2.git_refspec_force(refspec) == 1 ? true : false;
+  return libgit2.git_refspec_force(refspec) == 1 || false;
 }

 /// Get the refspec's string.
@ -40,7 +39,7 @@ bool matchesSource({

  calloc.free(refnameC);

-  return result == 1 ? true : false;
+  return result == 1 || false;
 }

 /// Check if a refspec's destination descriptor matches a reference.
@ -53,7 +52,7 @@ bool matchesDestination({

  calloc.free(refnameC);

-  return result == 1 ? true : false;
+  return result == 1 || false;
 }

 /// Transform a reference to its target following the refspec's rules.
--- a/lib/src/bindings/remote.dart
+++ b/lib/src/bindings/remote.dart
@ -1,11 +1,12 @@
 import 'dart:ffi';
+
 import 'package:ffi/ffi.dart';
-import '../callbacks.dart';
-import '../error.dart';
-import '../oid.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
-import 'remote_callbacks.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/remote_callbacks.dart';
+import 'package:libgit2dart/src/callbacks.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/oid.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Get a list of the configured remotes for a repo.
 ///
@ -14,7 +15,7 @@ List<String> list(Pointer<git_repository> repo) {
  final out = calloc<git_strarray>();
  libgit2.git_remote_list(out, repo);

-  var result = <String>[];
+  final result = <String>[];
  for (var i = 0; i < out.ref.count; i++) {
    result.add(out.ref.strings[i].cast<Utf8>().toDartString());
  }
@ -156,7 +157,7 @@ List<String> rename({
    calloc.free(out);
    throw LibGit2Error(libgit2.git_error_last());
  } else {
-    var result = <String>[];
+    final result = <String>[];
    for (var i = 0; i < out.ref.count; i++) {
      result.add(out.ref.strings[i].cast<Utf8>().toDartString());
    }
@ -247,7 +248,7 @@ List<String> fetchRefspecs(Pointer<git_remote> remote) {
  final out = calloc<git_strarray>();
  libgit2.git_remote_get_fetch_refspecs(out, remote);

-  var result = <String>[];
+  final result = <String>[];
  for (var i = 0; i < out.ref.count; i++) {
    result.add(out.ref.strings[i].cast<Utf8>().toDartString());
  }
@ -260,7 +261,7 @@ List<String> pushRefspecs(Pointer<git_remote> remote) {
  final out = calloc<git_strarray>();
  libgit2.git_remote_get_push_refspecs(out, remote);

-  var result = <String>[];
+  final result = <String>[];
  for (var i = 0; i < out.ref.count; i++) {
    result.add(out.ref.strings[i].cast<Utf8>().toDartString());
  }
@ -372,12 +373,12 @@ List<Map<String, Object?>> lsRemotes(Pointer<git_remote> remote) {
  final size = calloc<Uint64>();
  libgit2.git_remote_ls(out, size, remote);

-  var result = <Map<String, Object?>>[];
+  final result = <Map<String, Object?>>[];

  for (var i = 0; i < size.value; i++) {
-    var remote = <String, Object?>{};
+    final remote = <String, Object?>{};

-    final local = out[0][i].ref.local == 1 ? true : false;
+    final local = out[0][i].ref.local == 1 || false;

    remote['local'] = local;
    remote['loid'] = local ? Oid.fromRaw(out[0][i].ref.loid) : null;
@ -412,7 +413,7 @@ void fetch({
  String? reflogMessage,
  String? proxyOption,
 }) {
-  var refspecsC = calloc<git_strarray>();
+  final refspecsC = calloc<git_strarray>();
  final refspecsPointers =
      refspecs.map((e) => e.toNativeUtf8().cast<Int8>()).toList();
  final strArray = calloc<Pointer<Int8>>(refspecs.length);
@ -468,7 +469,7 @@ void push({
  required Callbacks callbacks,
  String? proxyOption,
 }) {
-  var refspecsC = calloc<git_strarray>();
+  final refspecsC = calloc<git_strarray>();
  final refspecsPointers =
      refspecs.map((e) => e.toNativeUtf8().cast<Int8>()).toList();
  final strArray = calloc<Pointer<Int8>>(refspecs.length);
--- a/lib/src/bindings/remote_callbacks.dart
+++ b/lib/src/bindings/remote_callbacks.dart
@ -2,16 +2,16 @@ import 'dart:ffi';

 import 'package:ffi/ffi.dart';
 import 'package:libgit2dart/libgit2dart.dart';
+import 'package:libgit2dart/src/bindings/credentials.dart'
+    as credentials_bindings;
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/callbacks.dart';
+import 'package:libgit2dart/src/credentials.dart';
+import 'package:libgit2dart/src/oid.dart';
+import 'package:libgit2dart/src/remote.dart';
+import 'package:libgit2dart/src/repository.dart';
 import 'package:libgit2dart/src/util.dart';

-import '../callbacks.dart';
-import '../credentials.dart';
-import '../oid.dart';
-import '../remote.dart';
-import '../repository.dart';
-import 'credentials.dart' as credentials_bindings;
-import 'libgit2_bindings.dart';
-
 class RemoteCallbacks {
  /// Callback function that reports transfer progress.
  static void Function(TransferProgress)? transferProgress;
@ -108,7 +108,7 @@ class RemoteCallbacks {
  ) {
    repo[0] = repositoryFunction!(
      path.cast<Utf8>().toDartString(),
-      bare == 1 ? true : false,
+      bare == 1 || false,
    ).pointer;

    return 0;
@ -146,7 +146,7 @@ class RemoteCallbacks {
    }

    if (credentials is UserPass) {
-      final cred = credentials as UserPass;
+      final cred = credentials! as UserPass;
      credPointer[0] = credentials_bindings.userPass(
        username: cred.username,
        password: cred.password,
@ -155,7 +155,7 @@ class RemoteCallbacks {
    }

    if (credentials is Keypair) {
-      final cred = credentials as Keypair;
+      final cred = credentials! as Keypair;
      credPointer[0] = credentials_bindings.sshKey(
        username: cred.username,
        publicKey: cred.pubKey,
@ -166,13 +166,13 @@ class RemoteCallbacks {
    }

    if (credentials is KeypairFromAgent) {
-      final cred = credentials as KeypairFromAgent;
+      final cred = credentials! as KeypairFromAgent;
      credPointer[0] = credentials_bindings.sshKeyFromAgent(cred.username);
      payload.cast<Int8>().value++;
    }

    if (credentials is KeypairFromMemory) {
-      final cred = credentials as KeypairFromMemory;
+      final cred = credentials! as KeypairFromMemory;
      credPointer[0] = credentials_bindings.sshKeyFromMemory(
        username: cred.username,
        publicKey: cred.pubKey,
--- a/lib/src/bindings/repository.dart
+++ b/lib/src/bindings/repository.dart
@ -1,14 +1,13 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../callbacks.dart';
-import '../error.dart';
-import '../remote.dart';
-import '../repository.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
-import 'remote_callbacks.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/remote_callbacks.dart';
+import 'package:libgit2dart/src/callbacks.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/remote.dart';
+import 'package:libgit2dart/src/repository.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Attempt to open an already-existing repository at [path].
 ///
@ -219,7 +218,7 @@ void setNamespace({

 /// Check if a repository is bare or not.
 bool isBare(Pointer<git_repository> repo) {
-  return libgit2.git_repository_is_bare(repo) == 1 ? true : false;
+  return libgit2.git_repository_is_bare(repo) == 1 || false;
 }

 /// Check if a repository is empty.
@ -234,7 +233,7 @@ bool isEmpty(Pointer<git_repository> repo) {
  if (error < 0) {
    throw LibGit2Error(libgit2.git_error_last());
  } else {
-    return error == 1 ? true : false;
+    return error == 1 || false;
  }
 }

@ -268,7 +267,7 @@ bool isHeadDetached(Pointer<git_repository> repo) {
  if (error < 0) {
    throw LibGit2Error(libgit2.git_error_last());
  } else {
-    return error == 1 ? true : false;
+    return error == 1 || false;
  }
 }

@ -284,7 +283,7 @@ bool isBranchUnborn(Pointer<git_repository> repo) {
  if (error < 0) {
    throw LibGit2Error(libgit2.git_error_last());
  } else {
-    return error == 1 ? true : false;
+    return error == 1 || false;
  }
 }

@ -312,7 +311,7 @@ Map<String, String> identity(Pointer<git_repository> repo) {
  final name = calloc<Pointer<Int8>>();
  final email = calloc<Pointer<Int8>>();
  libgit2.git_repository_ident(name, email, repo);
-  var identity = <String, String>{};
+  final identity = <String, String>{};

  if (name.value == nullptr && email.value == nullptr) {
    return identity;
@ -369,12 +368,12 @@ Pointer<git_index> index(Pointer<git_repository> repo) {

 /// Determine if the repository was a shallow clone.
 bool isShallow(Pointer<git_repository> repo) {
-  return libgit2.git_repository_is_shallow(repo) == 1 ? true : false;
+  return libgit2.git_repository_is_shallow(repo) == 1 || false;
 }

 /// Check if a repository is a linked work tree.
 bool isWorktree(Pointer<git_repository> repo) {
-  return libgit2.git_repository_is_worktree(repo) == 1 ? true : false;
+  return libgit2.git_repository_is_worktree(repo) == 1 || false;
 }

 /// Retrieve git's prepared message.
--- a/lib/src/bindings/reset.dart
+++ b/lib/src/bindings/reset.dart
@ -1,7 +1,7 @@
 import 'dart:ffi';

-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Sets the current head to the specified commit oid and optionally resets the
 /// index and working tree to match.
--- a/lib/src/bindings/revparse.dart
+++ b/lib/src/bindings/revparse.dart
@ -1,10 +1,9 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Parse a revision string for from, to, and intent.
 ///
@ -69,7 +68,7 @@ Pointer<git_object> revParseSingle({
 /// The returned object and reference should be released when no longer needed.
 ///
 /// Throws a [LibGit2Error] if error occured.
-List revParseExt({
+List<Pointer> revParseExt({
  required Pointer<git_repository> repoPointer,
  required String spec,
 }) {
@ -91,7 +90,7 @@ List revParseExt({
    calloc.free(referenceOut);
    throw LibGit2Error(libgit2.git_error_last());
  } else {
-    var result = <Pointer>[];
+    final result = <Pointer>[];
    result.add(objectOut.value);
    if (referenceOut.value != nullptr) {
      result.add(referenceOut.value);
--- a/lib/src/bindings/revwalk.dart
+++ b/lib/src/bindings/revwalk.dart
@ -1,11 +1,10 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'commit.dart' as commit_bindings;
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/commit.dart' as commit_bindings;
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Allocate a new revision walker to iterate through a repo.
 ///
@ -79,7 +78,7 @@ List<Pointer<git_commit>> walk({
  required Pointer<git_repository> repoPointer,
  required Pointer<git_revwalk> walkerPointer,
 }) {
-  var result = <Pointer<git_commit>>[];
+  final result = <Pointer<git_commit>>[];
  var error = 0;

  while (error == 0) {
--- a/lib/src/bindings/signature.dart
+++ b/lib/src/bindings/signature.dart
@ -1,10 +1,9 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Create a new action signature.
 ///
--- a/lib/src/bindings/stash.dart
+++ b/lib/src/bindings/stash.dart
@ -1,13 +1,12 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../error.dart';
-import '../oid.dart';
-import '../stash.dart';
-import '../util.dart';
-import 'checkout.dart' as checkout_bindings;
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/checkout.dart' as checkout_bindings;
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/oid.dart';
+import 'package:libgit2dart/src/stash.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Save the local modifications to a new stash.
 ///
@ -148,18 +147,20 @@ int _stashCb(
  Pointer<git_oid> oid,
  Pointer<Void> payload,
 ) {
-  _stashList.add(Stash(
-    index: index,
-    message: message.cast<Utf8>().toDartString(),
-    oid: Oid(oid),
-  ));
+  _stashList.add(
+    Stash(
+      index: index,
+      message: message.cast<Utf8>().toDartString(),
+      oid: Oid(oid),
+    ),
+  );
  return 0;
 }

 /// Loop over all the stashed states.
 List<Stash> list(Pointer<git_repository> repo) {
  const except = -1;
-  git_stash_cb callBack = Pointer.fromFunction(_stashCb, except);
+  final git_stash_cb callBack = Pointer.fromFunction(_stashCb, except);
  libgit2.git_stash_foreach(repo, callBack, nullptr);

  final result = _stashList.toList(growable: false);
--- a/lib/src/bindings/status.dart
+++ b/lib/src/bindings/status.dart
@ -2,10 +2,9 @@ import 'dart:ffi';

 import 'package:ffi/ffi.dart';
 import 'package:libgit2dart/libgit2dart.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Gather file status information and populate the git_status_list.
 ///
--- a/lib/src/bindings/submodule.dart
+++ b/lib/src/bindings/submodule.dart
@ -1,12 +1,11 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../callbacks.dart';
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
-import 'remote_callbacks.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/remote_callbacks.dart';
+import 'package:libgit2dart/src/callbacks.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// List of submodule paths.
 ///
@ -27,8 +26,10 @@ int _listCb(
 List<String> list(Pointer<git_repository> repo) {
  const except = -1;
  final callback = Pointer.fromFunction<
-          Int32 Function(Pointer<git_submodule>, Pointer<Int8>, Pointer<Void>)>(
-      _listCb, except);
+      Int32 Function(Pointer<git_submodule>, Pointer<Int8>, Pointer<Void>)>(
+    _listCb,
+    except,
+  );

  libgit2.git_submodule_foreach(repo, callback, nullptr);

--- a/lib/src/bindings/tag.dart
+++ b/lib/src/bindings/tag.dart
@ -1,10 +1,9 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Fill a list with all the tags in the repository.
 ///
@ -13,7 +12,7 @@ List<String> list(Pointer<git_repository> repo) {
  final out = calloc<git_strarray>();
  final error = libgit2.git_tag_list(out, repo);

-  var result = <String>[];
+  final result = <String>[];

  if (error < 0) {
    calloc.free(out);
--- a/lib/src/bindings/tree.dart
+++ b/lib/src/bindings/tree.dart
@ -1,10 +1,9 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Get the id of a tree.
 Pointer<git_oid> id(Pointer<git_tree> tree) => libgit2.git_tree_id(tree);
--- a/lib/src/bindings/treebuilder.dart
+++ b/lib/src/bindings/treebuilder.dart
@ -1,10 +1,9 @@
 import 'dart:ffi';

 import 'package:ffi/ffi.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Create a new tree builder.
 ///
--- a/lib/src/bindings/worktree.dart
+++ b/lib/src/bindings/worktree.dart
@ -2,10 +2,9 @@ import 'dart:ffi';

 import 'package:ffi/ffi.dart';
 import 'package:libgit2dart/libgit2dart.dart';
-
-import '../error.dart';
-import '../util.dart';
-import 'libgit2_bindings.dart';
+import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
+import 'package:libgit2dart/src/error.dart';
+import 'package:libgit2dart/src/util.dart';

 /// Add a new working tree.
 ///
@ -81,7 +80,7 @@ bool isPrunable(Pointer<git_worktree> wt) {
    GIT_WORKTREE_PRUNE_OPTIONS_VERSION,
  );

-  return libgit2.git_worktree_is_prunable(wt, opts) > 0 ? true : false;
+  return libgit2.git_worktree_is_prunable(wt, opts) > 0 || false;
 }

 /// Prune working tree.
@ -126,7 +125,7 @@ String path(Pointer<git_worktree> wt) {
 /// A worktree may be locked if the linked working tree is stored on a portable
 /// device which is not available.
 bool isLocked(Pointer<git_worktree> wt) {
-  return libgit2.git_worktree_is_locked(nullptr, wt) == 1 ? true : false;
+  return libgit2.git_worktree_is_locked(nullptr, wt) == 1 || false;
 }

 /// Lock worktree if not already locked.
@ -140,7 +139,7 @@ void unlock(Pointer<git_worktree> wt) => libgit2.git_worktree_unlock(wt);
 /// A valid worktree requires both the git data structures inside the linked
 /// parent repository and the linked working copy to be present.
 bool isValid(Pointer<git_worktree> wt) {
-  return libgit2.git_worktree_validate(wt) == 0 ? true : false;
+  return libgit2.git_worktree_validate(wt) == 0 || false;
 }

 /// Free a previously allocated worktree.