Merge pull request #197 from martinling/additional-descriptors

Display all descriptor types in device view

.gitignore

@@ -1,6 +1,7 @@
 /docs/build/
 /target
 /tests/*/output.txt
+/tests/*/devices-output.txt
 /tests/ui/*/output.txt
 /vcpkg
 /wix/LICENSE-dynamic-libraries.txt

src/record_ui.rs

@@ -160,7 +160,7 @@ impl Recording {
         Model: ListModelExt + GenericModel<Item, ViewMode>,
         CaptureReader: ItemSource<Item, ViewMode>,
         Object: ToGenericRowData<Item>,
-        Item: Copy,
+        Item: Clone,
         ViewMode: Copy,
     {
         if (removed, added) == (0, 0) {
@@ -204,17 +204,16 @@ impl Recording {
         where Model: ListModelExt + GenericModel<Item, ViewMode>,
               CaptureReader: ItemSource<Item, ViewMode>,
               Object: ToGenericRowData<Item>,
-              Item: Copy,
+              Item: Clone,
               ViewMode: Copy
     {
-        let item = model
+        let node = &model
             .item(position)
             .expect("Failed to retrieve row data")
             .to_generic_row_data()
             .node()
-            .expect("Failed to fetch item node from row data")
-            .borrow()
-            .item;
+            .expect("Failed to fetch item node from row data");
+        let item = &node.borrow().item;
         self.capture
             .description(&item, false)
             .expect("Failed to generate item summary")

src/row_data.rs

@@ -10,7 +10,7 @@ use crate::capture::{TrafficItem, DeviceItem};
 use crate::tree_list_model::ItemNodeRc;
 
 /// Trait implemented by each of our row data types.
-pub trait GenericRowData<Item> where Item: Copy {
+pub trait GenericRowData<Item> where Item: Clone {
     /// Create a row for the given node.
     fn new(node: Result<ItemNodeRc<Item>, String>) -> Self where Self: Sized;
 

src/test_cynthion.rs

@@ -117,7 +117,7 @@ fn test(save_capture: bool,
 
     // Look for the test device in the capture.
     let device_id = DeviceId::from(1);
-    let device_data = reader.device_data(&device_id)?;
+    let device_data = reader.device_data(device_id)?;
     ensure!(device_data.description() == "USB Analyzer Test Device",
             "Device found did not have expected description");
     println!("Found test device in capture");

src/tree_list_model.rs

@@ -157,7 +157,7 @@ impl<Item> Node<Item> for RootNode<Item> {
     }
 }
 
-impl<Item> Node<Item> for ItemNode<Item> where Item: Copy {
+impl<Item> Node<Item> for ItemNode<Item> where Item: Clone {
     fn item(&self) -> Option<&Item> {
         Some(&self.item)
     }
@@ -205,7 +205,7 @@ trait UpdateTotal<Item> {
 }
 
 impl<T, Item> UpdateTotal<Item> for Rc<RefCell<T>>
-where T: Node<Item> + 'static, Item: Copy + 'static
+where T: Node<Item> + 'static, Item: Clone + 'static
 {
     fn update_total(&self, expanded: bool, rows_affected: u64)
         -> Result<(), Error>
@@ -232,7 +232,7 @@ trait NodeRcOps<Item>: UpdateTotal<Item> {
 }
 
 impl<Item> NodeRcOps<Item> for RootNodeRc<Item>
-where Item: Copy + 'static
+where Item: Clone + 'static
 {
     fn source(&self) -> Source<Item> {
         TopLevelItems()
@@ -244,7 +244,7 @@ where Item: Copy + 'static
 }
 
 impl<Item> NodeRcOps<Item> for ItemNodeRc<Item>
-where Item: Copy + 'static
+where Item: Clone + 'static
 {
     fn source(&self) -> Source<Item> {
         ChildrenOf(self.clone())
@@ -255,7 +255,7 @@ where Item: Copy + 'static
     }
 }
 
-impl<Item> ItemNode<Item> where Item: Copy {
+impl<Item> ItemNode<Item> where Item: Clone {
 
     pub fn expanded(&self) -> bool {
         Node::<Item>::expanded(self)
@@ -357,7 +357,7 @@ pub struct TreeListModel<Item, Model, RowData, ViewMode> {
 }
 
 impl<Item, Model, RowData, ViewMode> TreeListModel<Item, Model, RowData, ViewMode>
-where Item: 'static + Copy + Debug,
+where Item: 'static + Clone + Debug,
       ViewMode: Copy,
       Model: GenericModel<Item, ViewMode> + ListModelExt,
       RowData: GenericRowData<Item> + IsA<Object> + Cast,

src/ui.rs

@@ -629,7 +629,7 @@ fn create_view<Item, Model, RowData, ViewMode>(
         recording_args: (&Rc<RefCell<Recording>>, &'static str))
     -> (Model, SingleSelection, ColumnView)
     where
-        Item: Copy + 'static,
+        Item: Clone + 'static,
         ViewMode: Copy,
         Model: GenericModel<Item, ViewMode> + IsA<ListModel> + IsA<Object>,
         RowData: GenericRowData<Item> + IsA<Object>,