From e751f12ac5ba572867c95d34773c5e7f49e81e19 Mon Sep 17 00:00:00 2001
From: Chris Fallin <chris@cfallin.org>
Date: Tue, 14 Sep 2021 22:55:08 -0700
Subject: [PATCH] Refactor to allow use as library, in order to allow build.rs
 usage.

---
 cranelift/isle/src/{main.rs => bin/isle.rs} | 12 ++----------
 cranelift/isle/src/ir.rs                    |  4 ----
 cranelift/isle/src/lexer.rs                 |  6 ------
 3 files changed, 2 insertions(+), 20 deletions(-)
 rename cranelift/isle/src/{main.rs => bin/isle.rs} (94%)

diff --git a/cranelift/isle/src/main.rs b/cranelift/isle/src/bin/isle.rs
similarity index 94%
rename from cranelift/isle/src/main.rs
rename to cranelift/isle/src/bin/isle.rs
index 13c37a8125..be99d7301f 100644
--- a/cranelift/isle/src/main.rs
+++ b/cranelift/isle/src/bin/isle.rs
@@ -1,15 +1,6 @@
-#![allow(dead_code)]
-
 use clap::{App, Arg};
 
-mod ast;
-mod codegen;
-mod compile;
-mod error;
-mod ir;
-mod lexer;
-mod parser;
-mod sema;
+use isle::{error, lexer, parser, compile};
 
 fn main() -> Result<(), error::Error> {
     let _ = env_logger::try_init();
@@ -73,3 +64,4 @@ fn main() -> Result<(), error::Error> {
 
     Ok(())
 }
+
diff --git a/cranelift/isle/src/ir.rs b/cranelift/isle/src/ir.rs
index d9657297ea..82cc027d35 100644
--- a/cranelift/isle/src/ir.rs
+++ b/cranelift/isle/src/ir.rs
@@ -477,10 +477,6 @@ impl ExprSequence {
         });
     }
 
-    fn add_multi_return(&mut self, index: usize, ty: TypeId, value: Value) {
-        self.add_inst(ExprInst::Return { index, ty, value });
-    }
-
     /// Creates a sequence of ExprInsts to generate the given
     /// expression value. Returns the value ID as well as the root
     /// term ID, if any.
diff --git a/cranelift/isle/src/lexer.rs b/cranelift/isle/src/lexer.rs
index 261dc9c910..372d169585 100644
--- a/cranelift/isle/src/lexer.rs
+++ b/cranelift/isle/src/lexer.rs
@@ -12,12 +12,6 @@ pub struct Lexer<'a> {
     lookahead: Option<(Pos, Token)>,
 }
 
-#[derive(Clone, Debug)]
-enum LexerInput<'a> {
-    String { s: &'a str, filename: &'a str },
-    File { content: String, filename: String },
-}
-
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Default, Hash, PartialOrd, Ord)]
 pub struct Pos {
     pub file: usize,