Allow registers to have non-'static lifetime

Author: bgamari

ioreg/builder/accessors.rs

@@ -82,7 +82,7 @@ fn build_field_accessors<'a>(cx: &'a ExtCtxt, path: &Vec<String>,
     },
     None => "no documentation".into_string()
   };
-  let docstring = format!("*[{}]* Field `{}`: {}",
+  let docstring = format!("*[{}]* `{}` field: {}",
                           access_tag,
                           field.name.node,
                           field_doc);
@@ -111,7 +111,7 @@ fn build_get_fn<'a>(cx: &'a ExtCtxt, path: &Vec<String>, reg: &node::Reg)
     impl $reg_ty {
       $doc_attr
       #[allow(dead_code)]
-      pub fn get(&'static self) -> $getter_ty {
+      pub fn get(&self) -> $getter_ty {
         $getter_ty::new(self)
       }
     }
@@ -131,7 +131,7 @@ fn build_field_set_fn<'a>(cx: &'a ExtCtxt, path: &Vec<String>,
   if field.count.node == 1 {
     quote_method!(cx,
       #[allow(dead_code, missing_doc)]
-      pub fn $fn_name(&'static self, new_value: $field_ty) -> $setter_ty {
+      pub fn $fn_name<'a>(&'a self, new_value: $field_ty) -> $setter_ty<'a> {
         let mut setter: $setter_ty = $setter_ty::new(self);
         setter.$fn_name(new_value);
         setter
@@ -140,7 +140,7 @@ fn build_field_set_fn<'a>(cx: &'a ExtCtxt, path: &Vec<String>,
   } else {
     quote_method!(cx,
       #[allow(dead_code, missing_doc)]
-      pub fn $fn_name(&'static self, idx: uint, new_value: $field_ty) -> $setter_ty {
+      pub fn $fn_name<'a>(&'a self, idx: uint, new_value: $field_ty) -> $setter_ty<'a> {
         let mut setter: $setter_ty = $setter_ty::new(self);
         setter.$fn_name(idx, new_value);
         setter
@@ -160,14 +160,14 @@ fn build_field_get_fn<'a>(cx: &'a ExtCtxt, path: &Vec<String>,
   if field.count.node == 1 {
     quote_method!(cx,
       #[allow(dead_code, missing_doc)]
-      pub fn $fn_name(&'static self) -> $field_ty {
+      pub fn $fn_name(&self) -> $field_ty {
         $getter_ty::new(self).$fn_name()
       }
     )
   } else {
     quote_method!(cx,
       #[allow(dead_code, missing_doc)]
-      pub fn $fn_name(&'static self, idx: uint) -> $field_ty {
+      pub fn $fn_name(&self, idx: uint) -> $field_ty {
         $getter_ty::new(self).$fn_name(idx)
       }
     )
@@ -184,7 +184,7 @@ fn build_field_clear_fn<'a>(cx: &'a ExtCtxt, path: &Vec<String>,
   if field.count.node == 1 {
     quote_method!(cx,
       #[allow(dead_code, missing_doc)]
-      pub fn $fn_name(&'static self) -> $setter_ty {
+      pub fn $fn_name<'a>(&'a self) -> $setter_ty<'a> {
         let mut setter: $setter_ty = $setter_ty::new(self);
         setter.$fn_name();
         setter
@@ -193,7 +193,7 @@ fn build_field_clear_fn<'a>(cx: &'a ExtCtxt, path: &Vec<String>,
   } else {
     quote_method!(cx,
       #[allow(dead_code, missing_doc)]
-      pub fn $fn_name(&'static self, idx: uint) -> $setter_ty {
+      pub fn $fn_name<'a>(&'a self, idx: uint) -> $setter_ty<'a> {
         let mut setter: $setter_ty = $setter_ty::new(self);
         setter.$fn_name(idx);
         setter

ioreg/builder/getter.rs

@@ -83,7 +83,7 @@ fn build_new<'a>(cx: &'a ExtCtxt, path: &Vec<String>)
                                           utils::getter_name(cx, path));
   let item = quote_item!(cx,
     #[doc = "Create a getter reflecting the current value of the given register."]
-    pub fn new(reg: &'static $reg_ty) -> $getter_ty {
+    pub fn new(reg: & $reg_ty) -> $getter_ty {
       $getter_ty {
         value: reg.value.get(),
       }

ioreg/builder/setter.rs

@@ -75,10 +75,10 @@ fn build_type<'a>(cx: &'a ExtCtxt, path: &Vec<String>,
   let item = quote_item!(cx,
     $doc_attr
     #[allow(non_camel_case_types)]
-    pub struct $name {
+    pub struct $name<'a> {
       value: $packed_ty,
       mask: $packed_ty,
-      reg: &'static $reg_ty,
+      reg: &'a $reg_ty,
     }
   );
   item.unwrap()
@@ -92,7 +92,7 @@ fn build_new<'a>(cx: &'a ExtCtxt, path: &Vec<String>)
                                           utils::setter_name(cx, path));
   let item = quote_item!(cx,
     #[doc="Create a new updater"]
-    pub fn new(reg: &'static $reg_ty) -> $setter_ty {
+    pub fn new(reg: &'a $reg_ty) -> $setter_ty {
       $setter_ty {
         value: 0,
         mask: 0,
@@ -125,7 +125,7 @@ fn build_drop<'a>(cx: &'a ExtCtxt, path: &Vec<String>,
   let item = quote_item!(cx,
     #[unsafe_destructor]
     #[doc = "This performs the register update"]
-    impl Drop for $setter_ty {
+    impl<'a> Drop for $setter_ty<'a> {
       fn drop(&mut self) {
         let clear_mask: $unpacked_ty = $clear as $unpacked_ty;
         if self.mask != 0 {
@@ -161,7 +161,7 @@ fn build_impl<'a>(cx: &'a ExtCtxt, path: &Vec<String>, reg: &node::Reg,
   let done: P<ast::Method> = build_done(cx);
   let impl_ = quote_item!(cx,
     #[allow(dead_code)]
-    impl $setter_ty {
+    impl<'a> $setter_ty<'a> {
       $new
       $methods
       $done
@@ -206,8 +206,8 @@ fn build_field_set_fn<'a>(cx: &'a ExtCtxt, path: &Vec<String>, reg: &node::Reg,
     let shift = utils::shift(cx, None, field);
     quote_method!(cx,
       $doc_attr
-      pub fn $fn_name<'a>(&'a mut self, new_value: $field_ty)
-          -> &'a mut $setter_ty {
+      pub fn $fn_name<'b>(&'b mut self, new_value: $field_ty)
+          -> &'b mut $setter_ty<'a> {
         self.value |= (self.value & ! $mask) | ((new_value as $unpacked_ty) & $mask) << $shift;
         self.mask |= $mask << $shift;
         self
@@ -217,11 +217,11 @@ fn build_field_set_fn<'a>(cx: &'a ExtCtxt, path: &Vec<String>, reg: &node::Reg,
     let shift = utils::shift(cx, Some(quote_expr!(cx, idx)), field);
     quote_method!(cx,
       $doc_attr
-      pub fn $fn_name<'a>(&'a mut self, idx: uint, new_value: $field_ty)
-        -> &'a mut $setter_ty {
-          self.value |= (self.value & ! $mask) | ((new_value as $unpacked_ty) & $mask) << $shift;
-          self.mask |= $mask << $shift;
-          self
+      pub fn $fn_name<'b>(&'b mut self, idx: uint, new_value: $field_ty)
+          -> &'b mut $setter_ty<'a> {
+        self.value |= (self.value & ! $mask) | ((new_value as $unpacked_ty) & $mask) << $shift;
+        self.mask |= $mask << $shift;
+        self
       }
     )
   }
@@ -248,21 +248,20 @@ fn build_field_clear_fn<'a>(cx: &'a ExtCtxt, path: &Vec<String>,
     let shift = utils::shift(cx, None, field);
     quote_method!(cx,
       $doc_attr
-      pub fn $fn_name<'a>(&'a mut self) -> &'a mut $setter_ty {
-          self.value |= $mask << $shift;
-          self.mask |= $mask << $shift;
-          self
+      pub fn $fn_name<'b>(&'b mut self) -> &'b mut $setter_ty<'a> {
+        self.value |= $mask << $shift;
+        self.mask |= $mask << $shift;
+        self
       }
     )
   } else {
     let shift = utils::shift(cx, Some(quote_expr!(cx, idx)), field);
     quote_method!(cx,
       $doc_attr
-      pub fn $fn_name<'a>(&'a mut self, idx: uint)
-                          -> &'a mut $setter_ty {
-          self.value |= $mask << $shift;
-          self.mask |= $mask << $shift;
-          self
+      pub fn $fn_name<'b>(&'b mut self, idx: uint) -> &'b mut $setter_ty<'a> {
+        self.value |= $mask << $shift;
+        self.mask |= $mask << $shift;
+        self
       }
     )
   }