Avoid unnecessary dynamic dispatch.

examples/print.rs

@@ -1,3 +1,4 @@
+use polib::message::MessageView;
 use polib::po_file;
 use std::env;
 use std::error::Error;

src/catalog/iterator.rs

@@ -32,7 +32,7 @@ impl<'a> Iter<'a> {
 }
 
 impl<'a> Iterator for Iter<'a> {
-    type Item = &'a dyn MessageView;
+    type Item = &'a Message;
 
     fn next(&mut self) -> Option<Self::Item> {
         while self.0.index < self.0.catalog.messages.len() {

src/catalog/mod.rs

@@ -3,7 +3,7 @@
 mod iterator;
 
 use crate::{
-    message::CatalogMessageMutView, message::Message, message::MessageKey, message::MessageView,
+    message::CatalogMessageMutView, message::Message, message::MessageKey,
     metadata::CatalogMetadata,
 };
 pub use iterator::{Iter, IterMut, MessageMutProxy};
@@ -62,7 +62,7 @@ impl Catalog {
         msgctxt: Option<&str>,
         msgid: &str,
         msgid_plural: Option<&str>,
-    ) -> Option<&dyn MessageView> {
+    ) -> Option<&Message> {
         let key = MessageKey::gen(msgctxt, msgid, msgid_plural);
         if let Some(&index) = self.map.get(&key) {
             Some(self.messages[index].as_ref().unwrap())

src/po_file/po_file_writer.rs

@@ -1,7 +1,7 @@
 //! Write PO files.
 
 use super::escape::escape;
-use crate::catalog::Catalog;
+use crate::{catalog::Catalog, message::MessageView};
 use std::fs::File;
 use std::io::{BufWriter, Write};
 use std::path::Path;

tests/test.rs

@@ -1,4 +1,5 @@
 use polib::catalog::Catalog;
+use polib::message::MessageView;
 use polib::po_file;
 use std::path::Path;