Update with fugue-core change to use iset

.github/workflows/build.yml

@@ -26,11 +26,5 @@ jobs:
       with:
         submodules: 'recursive'
 
-    - name: add registry
-      run: |
-        mkdir -p ~/.cargo
-        echo '[registries]' >> ~/.cargo/config.toml
-        echo 'fugue = { index = "ssh://git@github.com/fugue-re/fugue-oss-registry" }' >> ~/.cargo/config.toml
-
     - name: build
-      run: cargo build --features="fugue-db/fixed-u64" --verbose
+      run: cargo build --features="fixed-u64" --no-default-features --verbose

Cargo.toml

@@ -3,10 +3,15 @@ name = "fugue-radare"
 version = "0.2.3"
 edition = "2018"
 
+[features]
+default = ["bigint"]
+bigint = ["fugue-db/bigint"]
+fixed-u64 = ["fugue-db/fixed-u64"]
+fixed-u128 = ["fugue-db/fixed-u128"]
+
 [dependencies]
-flatbuffers = "2.0"
-fugue-db = { version = "0.2", registry = "fugue", default-features = false }
-intervals = { version = "0.1", registry = "fugue" }
+fugue-db = { version = "0.2", default-features = false }
+iset = "0.2"
 itertools = "0.10"
 md5 = "0.7"
 sha2 = "0.9"
@@ -18,10 +23,10 @@ shared_memory = "0.12"
 thiserror = "1"
 which = "4"
 url = "2.2"
+flatbuffers = "23.1.21"
 
 [build-dependencies]
-flatc-rust = "0.2"
-flatc = { version = "0.2.1", registry = "fugue" }
+flatcc = "23.1.21"
 
 [dev-dependencies]
-fugue = { version = "0.2", registry = "fugue" }
+fugue = { version = "0.2", features = ["db"] }

build.rs

@@ -1,10 +1,6 @@
-use std::path::Path;
 use std::env;
 
 fn main() {
-    flatc_rust::Flatc::from_path(flatc::flatc()).run(flatc_rust::Args {
-        inputs: &[&env::current_dir().unwrap().join("schema/fugue.fbs")],
-        out_dir: Path::new(&env::var("OUT_DIR").unwrap()),
-        ..Default::default()
-    }).expect("schema compiled successfully");
+    flatcc::build(env::current_dir().unwrap().join("schema/fugue.fbs"))
+        .expect("schema compiled successfully");
 }

src/lib.rs

@@ -17,8 +17,7 @@ use fugue_db::backend::{Backend, Imported};
 use fugue_db::Error as ExportError;
 
 use itertools::Itertools;
-use intervals::Interval;
-use intervals::collections::IntervalSet;
+use iset::IntervalSet;
 use r2pipe::R2Pipe;
 
 pub use r2pipe::R2PipeSpawnOptions;
@@ -83,13 +82,17 @@ struct MetadataBin<'d> {
 #[derive(Debug, Deserialize)]
 struct MetadataCore<'d> {
     file: &'d str,
+    #[allow(unused)]
     size: u32,
 }
 
 #[derive(Debug, Deserialize)]
 struct MetadataHashes<'d> {
+    #[allow(unused)]
     md5: &'d str,
+    #[allow(unused)]
     sha1: &'d str,
+    #[allow(unused)]
     sha256: &'d str,
 }
 
@@ -189,6 +192,7 @@ struct Symbol<'d> {
     #[serde(default)]
     vaddr: u64,
     #[serde(default)]
+    #[allow(unused)]
     paddr: u64,
     is_imported: bool,
 }
@@ -389,10 +393,10 @@ impl<'db> RadareExporter<'db> {
             let input_path = self.builder.create_string(&corebin.core.file);
             let input_md5 = self
                 .builder
-                .create_vector_direct(&*md5);
+                .create_vector(&*md5);
             let input_sha256 = self
                 .builder
-                .create_vector_direct(&*sha256);
+                .create_vector(&*sha256);
             let input_format = self
                 .builder
                 .create_string(Metadata::format(&corebin.bin.bintype)?);
@@ -425,7 +429,7 @@ impl<'db> RadareExporter<'db> {
         }
 
         let name = self.builder.create_string(seg.name);
-        let bytes = self.builder.create_vector_direct(&content);
+        let bytes = self.builder.create_vector(&content);
 
         let mut sbuilder = schema::SegmentBuilder::new(&mut self.builder);
 
@@ -461,7 +465,7 @@ impl<'db> RadareExporter<'db> {
                 None
             } else {
                 let vaddr = s.address()?;
-                seg_ivt.insert(Interval::from(vaddr..=vaddr+(s.vsize as u64 - 1)));
+                seg_ivt.insert(vaddr..vaddr+(s.vsize as u64));
                 Some(self.export_segment(s))
             })
             .collect::<Result<Vec<_>, Error>>()?;
@@ -578,7 +582,7 @@ impl<'db> RadareExporter<'db> {
             let mut blk_ibps_map =
                 HashMap::<u64, (u64, BasicBlock, Vec<u64>, Vec<u64>)>::with_capacity(blks.len());
 
-            for (i, blk) in blks.into_iter().filter(|b| seg_ivt.overlaps(b.addr..=b.addr)).enumerate() {
+            for (i, blk) in blks.into_iter().filter(|b| seg_ivt.has_overlap(b.addr..=b.addr)).enumerate() {
                 let bid = (id as u64) << 32 | (i as u64);
                 let addr = blk.addr;
 
@@ -598,7 +602,7 @@ impl<'db> RadareExporter<'db> {
 
                 blk_map.insert(addr, bid);
 
-                let mut ibps = blk_ibps_map.entry(addr).or_default();
+                let ibps = blk_ibps_map.entry(addr).or_default();
                 ibps.0 = bid;
                 ibps.1 = blk;
                 ibps.3.extend(succs.into_iter());