Add internal::InnerAndOuterAnnotations::inner/outer_annotations/_mut()

milesgranger · Nov 3, 2019 · a47566b · a47566b
1 parent d3967c6
commit a47566b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/src/gen/function.rs b/src/gen/function.rs
@@ -186,13 +186,18 @@ impl Function {
 }
 
 impl internal::InnerAndOuterAnnotations for Function {
-    fn inner_annotations(&mut self) -> &mut Vec<String> {
+    fn inner_annotations_mut(&mut self) -> &mut Vec<String> {
         self.body.annotations_mut()
     }
-
-    fn outer_annotations(&mut self) -> &mut Vec<String> {
+    fn inner_annotations(&self) -> &[String] {
+        self.body.annotations()
+    }
+    fn outer_annotations_mut(&mut self) -> &mut Vec<String> {
         self.signature.annotations_mut()
     }
+    fn outer_annotations(&self) -> &[String] {
+        self.signature.annotations()
+    }
 }
 
 impl internal::Generics for Function {

diff --git a/src/gen/module.rs b/src/gen/module.rs
@@ -123,13 +123,19 @@ impl Module {
 }
 
 impl internal::InnerAndOuterAnnotations for Module {
-    fn inner_annotations(&mut self) -> &mut Vec<String> {
+    fn inner_annotations_mut(&mut self) -> &mut Vec<String> {
         &mut self.inner_annotations
     }
+    fn inner_annotations(&self) -> &[String] {
+        self.inner_annotations.as_slice()
+    }
 
-    fn outer_annotations(&mut self) -> &mut Vec<String> {
+    fn outer_annotations_mut(&mut self) -> &mut Vec<String> {
         &mut self.outer_annotations
     }
+    fn outer_annotations(&self) -> &[String] {
+        self.outer_annotations.as_slice()
+    }
 }
 
 impl internal::Docs for Module {

diff --git a/src/internal/mod.rs b/src/internal/mod.rs
@@ -10,8 +10,10 @@ pub trait Annotations {
 /// Internal trait to get access to the container storing the inner and outer annotations.
 /// Used for the generic implementation of `InnerAndOuterAnnotationExt`
 pub trait InnerAndOuterAnnotations {
-    fn inner_annotations(&mut self) -> &mut Vec<String>;
-    fn outer_annotations(&mut self) -> &mut Vec<String>;
+    fn inner_annotations_mut(&mut self) -> &mut Vec<String>;
+    fn inner_annotations(&self) -> &[String];
+    fn outer_annotations_mut(&mut self) -> &mut Vec<String>;
+    fn outer_annotations(&self) -> &[String];
 }
 
 /// Internal trait to get access to the container storing the fields.

diff --git a/src/traits/annotations.rs b/src/traits/annotations.rs
@@ -58,7 +58,7 @@ pub trait InnerAndOuterAnnotationExt {
 impl<T: InnerAndOuterAnnotations> InnerAndOuterAnnotationExt for T {
     /// Add a single inner annotation.
     fn add_inner_annotation(&mut self, annotation: impl ToString) -> &mut Self {
-        self.inner_annotations().push(annotation.to_string());
+        self.inner_annotations_mut().push(annotation.to_string());
         self
     }
 
@@ -67,14 +67,14 @@ impl<T: InnerAndOuterAnnotations> InnerAndOuterAnnotationExt for T {
         &mut self,
         annotations: impl IntoIterator<Item = impl ToString>,
     ) -> &mut Self {
-        self.inner_annotations()
+        self.inner_annotations_mut()
             .extend(annotations.into_iter().map(|a| a.to_string()));
         self
     }
 
     /// Add a single outer annotation.
     fn add_outer_annotation(&mut self, annotation: impl ToString) -> &mut Self {
-        self.outer_annotations().push(annotation.to_string());
+        self.outer_annotations_mut().push(annotation.to_string());
         self
     }
 
@@ -83,7 +83,7 @@ impl<T: InnerAndOuterAnnotations> InnerAndOuterAnnotationExt for T {
         &mut self,
         annotations: impl IntoIterator<Item = impl ToString>,
     ) -> &mut Self {
-        self.outer_annotations()
+        self.outer_annotations_mut()
             .extend(annotations.into_iter().map(|a| a.to_string()));
         self
     }