24/376: Drop ImportError and FindError

[Ludovic Courtès]

civodul pushed a commit to tag 1.8
in repository guix.

commit 0960d674d48808eaaa3475899f45cfd6c7c3e51d
Author: Eelco Dolstra <address@hidden>
Date:   Thu Jun 12 13:00:54 2014 +0200

    Drop ImportError and FindError
    
    We're not catching these anywhere.
---
 src/libexpr/nixexpr.hh |    2 --
 src/libexpr/primops.cc |    4 ----
 2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh
index b8d0929..9c631d0 100644
--- a/src/libexpr/nixexpr.hh
+++ b/src/libexpr/nixexpr.hh
@@ -15,8 +15,6 @@ MakeError(AssertionError, EvalError)
 MakeError(ThrownError, AssertionError)
 MakeError(Abort, EvalError)
 MakeError(TypeError, EvalError)
-MakeError(ImportError, EvalError) // error building an imported derivation
-MakeError(FindError, EvalError) // error building a nix-path component
 MakeError(UndefinedVarError, Error)
 
 
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index fecaf37..366911b 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -81,8 +81,6 @@ static void prim_scopedImport(EvalState & state, const Pos & 
pos, Value * * args
     } catch (InvalidPathError & e) {
         throw EvalError(format("cannot import `%1%', since path `%2%' is not 
valid, at %3%")
             % path % e.path % pos);
-    } catch (Error & e) {
-        throw ImportError(e.msg());
     }
 
     if (isStorePath(path) && store->isValidPath(path) && isDerivation(path)) {
@@ -701,8 +699,6 @@ static void prim_findFile(EvalState & state, const Pos & 
pos, Value * * args, Va
     } catch (InvalidPathError & e) {
         throw EvalError(format("cannot find `%1%', since path `%2%' is not 
valid, at %3%")
             % path % e.path % pos);
-    } catch (Error & e) {
-        throw FindError(e.msg());
     }
 
     mkPath(v, state.findFile(searchPath, path).c_str());