Get rid of extension_pool

1 files changed, 5 insertions, 7 deletions

diff --git a/build2/target.txx b/build2/target.txx
index bc63c75..66acfb8 100644
--- a/build2/target.txx
+++ b/build2/target.txx
@@ -3,7 +3,6 @@
 // license   : MIT; see accompanying LICENSE file
 
 #include <build2/scope>
-#include <build2/context>     // extension_pool
 #include <build2/diagnostics>
 #include <build2/prerequisite>
 
@@ -34,14 +33,14 @@ namespace build2
   //
   //
   template <const char* ext>
-  const string*
+  optional<string>
   target_extension_fix (const target_key&, scope&, bool)
   {
-    return &extension_pool.find (ext);
+    return string (ext);
   }
 
   template <const char* var, const char* def>
-  const string*
+  optional<string>
   target_extension_var (const target_key& tk, scope& s, bool)
   {
     // Include target type/pattern-specific variables.
@@ -51,10 +50,9 @@ namespace build2
       // Help the user here and strip leading '.' from the extension.
       //
       const string& e (cast<string> (l));
-      return &extension_pool.find (
-        !e.empty () && e.front () == '.' ? string (e, 1) : e);
+      return !e.empty () && e.front () == '.' ? string (e, 1) : e;
     }
 
-    return def != nullptr ? &extension_pool.find (def) : nullptr;
+    return def != nullptr ? optional<string> (def) : nullopt;
   }
 }