From 8248d6e8f6dd0798f22f6f3735ca99f9d1bbf513 Mon Sep 17 00:00:00 2001
From: Martin von Zweigbergk <martinvonz@google.com>
Date: Fri, 27 Jan 2023 08:59:04 -0800
Subject: [PATCH] graphlog: remove use of `PhantomData`

---
 src/graphlog.rs | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/graphlog.rs b/src/graphlog.rs
index 54c15a452..8c9f09bb1 100644
--- a/src/graphlog.rs
+++ b/src/graphlog.rs
@@ -15,7 +15,6 @@
 use std::hash::Hash;
 use std::io;
 use std::io::Write;
-use std::marker::PhantomData;
 
 use itertools::Itertools;
 use jujutsu_lib::settings::UserSettings;
@@ -58,10 +57,9 @@ pub trait GraphLog<K: Clone + Eq + Hash> {
     ) -> io::Result<()>;
 }
 
-pub struct SaplingGraphLog<'writer, K, R: Renderer<K, Output = String>> {
+pub struct SaplingGraphLog<'writer, R> {
     renderer: R,
     writer: &'writer mut dyn Write,
-    phantom: PhantomData<K>,
 }
 
 impl<K: Clone> From<&Edge<K>> for Ancestor<K> {
@@ -77,7 +75,7 @@ impl<K: Clone> From<&Edge<K>> for Ancestor<K> {
     }
 }
 
-impl<'writer, K, R> GraphLog<K> for SaplingGraphLog<'writer, K, R>
+impl<'writer, K, R> GraphLog<K> for SaplingGraphLog<'writer, R>
 where
     K: Clone + Eq + Hash,
     R: Renderer<K, Output = String>,
@@ -100,19 +98,18 @@ where
     }
 }
 
-impl<'writer, K, R> SaplingGraphLog<'writer, K, R>
-where
-    K: Clone + Eq + Hash + 'writer,
-    R: Renderer<K, Output = String> + 'writer,
-{
-    pub fn create(
+impl<'writer, R> SaplingGraphLog<'writer, R> {
+    pub fn create<K>(
         renderer: R,
         formatter: &'writer mut dyn Write,
-    ) -> Box<dyn GraphLog<K> + 'writer> {
+    ) -> Box<dyn GraphLog<K> + 'writer>
+    where
+        K: Clone + Eq + Hash + 'writer,
+        R: Renderer<K, Output = String> + 'writer,
+    {
         Box::new(SaplingGraphLog {
             renderer,
             writer: formatter,
-            phantom: PhantomData,
         })
     }
 }