Revised visibility of structs

Tag and TagIter are now in the header (like multiboot header) submodule

src/header.rs

@@ -0,0 +1,30 @@
+#[repr(C)]
+pub struct Tag {
+    pub typ: u32,
+    pub size: u32,
+    // tag specific fields
+}
+
+pub struct TagIter {
+    pub current: *const Tag,
+}
+
+impl Iterator for TagIter {
+    type Item = &'static Tag;
+
+    fn next(&mut self) -> Option<&'static Tag> {
+        match unsafe{&*self.current} {
+            &Tag{typ:0, size:8} => None, // end tag
+            tag => {
+                // go to next tag
+                let mut tag_addr = self.current as usize;
+                tag_addr += tag.size as usize;
+                tag_addr = ((tag_addr-1) & !0x7) + 0x8; //align at 8 byte
+                self.current = tag_addr as *const _;
+
+                Some(tag)
+            },
+        }
+    }
+}
+

src/lib.rs

@@ -1,5 +1,6 @@
 #![no_std]
 
+use header::{Tag, TagIter};
 pub use boot_loader_name::BootLoaderNameTag;
 pub use elf_sections::{ElfSectionsTag, ElfSection, ElfSectionIter, ElfSectionType, ElfSectionFlags};
 pub use elf_sections::{ELF_SECTION_WRITABLE, ELF_SECTION_ALLOCATED, ELF_SECTION_EXECUTABLE};
@@ -9,6 +10,7 @@ pub use module::{ModuleTag, ModuleIter};
 #[macro_use]
 extern crate bitflags;
 
+mod header;
 mod boot_loader_name;
 mod elf_sections;
 mod memory_map;
@@ -45,7 +47,7 @@ impl BootInformation {
     }
 
     pub fn module_tags(&self) -> ModuleIter {
-        ModuleIter::new(self.tags())
+        ModuleIter{ iter: self.tags() }
     }
 
     pub fn boot_loader_name_tag(&self) -> Option<&'static BootLoaderNameTag> {
@@ -70,33 +72,3 @@ impl BootInformation {
         TagIter{current: &self.first_tag as *const _}
     }
 }
-
-#[repr(C)]
-pub struct Tag {
-    typ: u32,
-    size: u32,
-    // tag specific fields
-}
-
-pub struct TagIter {
-    current: *const Tag,
-}
-
-impl Iterator for TagIter {
-    type Item = &'static Tag;
-
-    fn next(&mut self) -> Option<&'static Tag> {
-        match unsafe{&*self.current} {
-            &Tag{typ:0, size:8} => None, // end tag
-            tag => {
-                // go to next tag
-                let mut tag_addr = self.current as usize;
-                tag_addr += tag.size as usize;
-                tag_addr = ((tag_addr-1) & !0x7) + 0x8; //align at 8 byte
-                self.current = tag_addr as *const _;
-
-                Some(tag)
-            },
-        }
-    }
-}

src/module.rs

@@ -1,4 +1,4 @@
-use {Tag, TagIter};
+use header::{Tag, TagIter};
 
 #[repr(packed)]
 #[derive(Debug)]
@@ -33,13 +33,7 @@ impl ModuleTag {
 }
 
 pub struct ModuleIter {
-    iter: TagIter,
-}
-
-impl ModuleIter {
-    pub fn new(iter: TagIter) -> ModuleIter {
-        ModuleIter{ iter: iter }
-    }
+    pub iter: TagIter,
 }
 
 impl Iterator for ModuleIter {