From 3fc245343e3dd3eba7572e18213312669dd12101 Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@electriccoin.co>
Date: Fri, 29 Jan 2021 00:52:55 +0000
Subject: [PATCH] Return results from assigned regions

This makes it easier to pass variables out of a region.
---
 src/circuit.rs          |  8 ++++----
 src/circuit/layouter.rs | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/circuit.rs b/src/circuit.rs
index 562246f..e9ad299 100644
--- a/src/circuit.rs
+++ b/src/circuit.rs
@@ -154,9 +154,9 @@ pub trait Layouter<C: Chip> {
     ///     region.assign_advice(self.config.a, offset, || { Some(value)});
     /// });
     /// ```
-    fn assign_region<A, N, NR>(&mut self, name: N, assignment: A) -> Result<(), Error>
+    fn assign_region<A, AR, N, NR>(&mut self, name: N, assignment: A) -> Result<AR, Error>
     where
-        A: FnMut(Region<'_, C>) -> Result<(), Error>,
+        A: FnMut(Region<'_, C>) -> Result<AR, Error>,
         N: Fn() -> NR,
         NR: Into<String>;
 
@@ -202,9 +202,9 @@ impl<'a, C: Chip, L: Layouter<C> + 'a> Layouter<C> for NamespacedLayouter<'a, C,
         self.0.config()
     }
 
-    fn assign_region<A, N, NR>(&mut self, name: N, assignment: A) -> Result<(), Error>
+    fn assign_region<A, AR, N, NR>(&mut self, name: N, assignment: A) -> Result<AR, Error>
     where
-        A: FnMut(Region<'_, C>) -> Result<(), Error>,
+        A: FnMut(Region<'_, C>) -> Result<AR, Error>,
         N: Fn() -> NR,
         NR: Into<String>,
     {
diff --git a/src/circuit/layouter.rs b/src/circuit/layouter.rs
index 6f1a348..88ad9cc 100644
--- a/src/circuit/layouter.rs
+++ b/src/circuit/layouter.rs
@@ -106,9 +106,9 @@ impl<'a, C: Chip, CS: Assignment<C::Field> + 'a> Layouter<C> for SingleChip<'a,
         &self.config
     }
 
-    fn assign_region<A, N, NR>(&mut self, name: N, mut assignment: A) -> Result<(), Error>
+    fn assign_region<A, AR, N, NR>(&mut self, name: N, mut assignment: A) -> Result<AR, Error>
     where
-        A: FnMut(Region<'_, C>) -> Result<(), Error>,
+        A: FnMut(Region<'_, C>) -> Result<AR, Error>,
         N: Fn() -> NR,
         NR: Into<String>,
     {
@@ -136,13 +136,13 @@ impl<'a, C: Chip, CS: Assignment<C::Field> + 'a> Layouter<C> for SingleChip<'a,
 
         self.cs.enter_region(name);
         let mut region = SingleChipRegion::new(self, region_index);
-        {
+        let result = {
             let region: &mut dyn RegionLayouter<C> = &mut region;
-            assignment(region.into())?;
-        }
+            assignment(region.into())
+        }?;
         self.cs.exit_region();
 
-        Ok(())
+        Ok(result)
     }
 
     fn get_root(&mut self) -> &mut Self::Root {