Avoid deprecated functions in tests/examples

examples/demo/ui.rs

@@ -1,7 +1,7 @@
 use tui::{
     backend::Backend,
     layout::{Constraint, Direction, Layout, Rect},
-    style::{Color, Modifier, Style},
+    style::{Color, Modifier, Style, StyleDiff},
     symbols,
     widgets::canvas::{Canvas, Line, Map, MapResolution, Rectangle},
     widgets::{
@@ -113,7 +113,11 @@ where
             let tasks = app.tasks.items.iter().map(|i| Text::raw(*i));
             let tasks = List::new(tasks)
                 .block(Block::default().borders(Borders::ALL).title("List"))
-                .highlight_style(Style::default().fg(Color::Yellow).modifier(Modifier::BOLD))
+                .highlight_style_diff(
+                    StyleDiff::default()
+                        .fg(Color::Yellow)
+                        .modifier(Modifier::BOLD),
+                )
                 .highlight_symbol("> ");
             f.render_stateful_widget(tasks, chunks[0], &mut app.tasks.state);
 
@@ -261,7 +265,7 @@ where
     });
     let table = Table::new(header.iter(), rows)
         .block(Block::default().title("Servers").borders(Borders::ALL))
-        .header_style(Style::default().fg(Color::Yellow))
+        .header_style_diff(StyleDiff::default().fg(Color::Yellow))
         .widths(&[
             Constraint::Length(15),
             Constraint::Length(15),

examples/list.rs

@@ -10,7 +10,7 @@ use termion::{event::Key, input::MouseTerminal, raw::IntoRawMode, screen::Altern
 use tui::{
     backend::TermionBackend,
     layout::{Constraint, Corner, Direction, Layout},
-    style::{Color, Modifier, Style},
+    style::{Color, Modifier, Style, StyleDiff},
     widgets::{Block, Borders, List, Text},
     Terminal,
 };
@@ -100,7 +100,11 @@ fn main() -> Result<(), Box<dyn Error>> {
             let items = List::new(items)
                 .block(Block::default().borders(Borders::ALL).title("List"))
                 .style(style)
-                .highlight_style(style.fg(Color::LightGreen).modifier(Modifier::BOLD))
+                .highlight_style_diff(
+                    StyleDiff::default()
+                        .fg(Color::LightGreen)
+                        .modifier(Modifier::BOLD),
+                )
                 .highlight_symbol(">");
             f.render_stateful_widget(items, chunks[0], &mut app.items.state);
 

examples/table.rs

@@ -7,7 +7,7 @@ use termion::{event::Key, input::MouseTerminal, raw::IntoRawMode, screen::Altern
 use tui::{
     backend::TermionBackend,
     layout::{Constraint, Layout},
-    style::{Color, Modifier, Style},
+    style::{Color, Modifier, Style, StyleDiff},
     widgets::{Block, Borders, Row, Table, TableState},
     Terminal,
 };
@@ -94,7 +94,9 @@ fn main() -> Result<(), Box<dyn Error>> {
                 .margin(5)
                 .split(f.size());
 
-            let selected_style = Style::default().fg(Color::Yellow).modifier(Modifier::BOLD);
+            let selected_style = StyleDiff::default()
+                .fg(Color::Yellow)
+                .modifier(Modifier::BOLD);
             let normal_style = Style::default().fg(Color::White);
             let header = ["Header1", "Header2", "Header3"];
             let rows = table
@@ -103,7 +105,7 @@ fn main() -> Result<(), Box<dyn Error>> {
                 .map(|i| Row::StyledData(i.iter(), normal_style));
             let t = Table::new(header.iter(), rows)
                 .block(Block::default().borders(Borders::ALL).title("Table"))
-                .highlight_style(selected_style)
+                .highlight_style_diff(selected_style)
                 .highlight_symbol(">> ")
                 .widths(&[
                     Constraint::Percentage(50),

src/widgets/list.rs

@@ -41,12 +41,12 @@ impl ListState {
 ///
 /// ```
 /// # use tui::widgets::{Block, Borders, List, Text};
-/// # use tui::style::{Style, Color, Modifier};
+/// # use tui::style::{Style, StyleDiff, Color, Modifier};
 /// let items = ["Item 1", "Item 2", "Item 3"].iter().map(|i| Text::raw(*i));
 /// List::new(items)
 ///     .block(Block::default().title("List").borders(Borders::ALL))
 ///     .style(Style::default().fg(Color::White))
-///     .highlight_style(Style::default().modifier(Modifier::ITALIC))
+///     .highlight_style_diff(StyleDiff::default().modifier(Modifier::ITALIC))
 ///     .highlight_symbol(">>");
 /// ```
 #[derive(Debug, Clone)]

src/widgets/table.rs

@@ -62,7 +62,7 @@ where
 /// ```
 /// # use tui::widgets::{Block, Borders, Table, Row};
 /// # use tui::layout::Constraint;
-/// # use tui::style::{Style, Color};
+/// # use tui::style::{Style, StyleDiff, Color};
 /// let row_style = Style::default().fg(Color::White);
 /// Table::new(
 ///         ["Col1", "Col2", "Col3"].into_iter(),
@@ -74,7 +74,7 @@ where
 ///         ].into_iter()
 ///     )
 ///     .block(Block::default().title("Table"))
-///     .header_style(Style::default().fg(Color::Yellow))
+///     .header_style_diff(StyleDiff::default().fg(Color::Yellow))
 ///     .widths(&[Constraint::Length(5), Constraint::Length(5), Constraint::Length(10)])
 ///     .style(Style::default().fg(Color::White))
 ///     .column_spacing(1);

tests/widgets_list.rs

@@ -23,7 +23,7 @@ fn widgets_list_should_highlight_the_selected_item() {
                 Text::raw("Item 3"),
             ];
             let list = List::new(items.into_iter())
-                .highlight_style(Style::default().bg(Color::Yellow))
+                .highlight_style_diff(Style::default().bg(Color::Yellow).into())
                 .highlight_symbol(">> ");
             f.render_stateful_widget(list, size, &mut state);
         })
@@ -42,7 +42,7 @@ fn widgets_list_should_merge_styles_in_correct_order() {
     let mut state = ListState::default();
     state.select(Some(1));
     terminal
-        .draw(|mut f| {
+        .draw(|f| {
             let size = f.size();
             let items = vec![
                 Text::raw("Item 1"),
@@ -135,7 +135,7 @@ fn widgets_list_can_be_styled() {
         let mut state = ListState::default();
         state.select(Some(1));
         terminal
-            .draw(|mut f| {
+            .draw(|f| {
                 let size = f.size();
                 let items = vec![
                     Text::raw("Item1"),

tests/widgets_table.rs

@@ -425,7 +425,7 @@ fn widgets_table_can_be_styled() {
         let mut terminal = Terminal::new(backend).unwrap();
 
         terminal
-            .draw(|mut f| {
+            .draw(|f| {
                 let size = f.size();
                 let table = Table::new(
                     ["Head1", "Head2", "Head3"].iter(),