rename as_boxed_view_ext to into_boxed_view_ext

This commit is contained in:
Henrik Friedrichsen
2021-03-22 22:36:33 +01:00
parent 5295eb4b5a
commit d2edfc3caf
12 changed files with 15 additions and 15 deletions

View File

@@ -225,7 +225,7 @@ impl ListItem for Album {
}
fn open(&self, queue: Arc<Queue>, library: Arc<Library>) -> Option<Box<dyn ViewExt>> {
Some(AlbumView::new(queue, library, self).as_boxed_view_ext())
Some(AlbumView::new(queue, library, self).into_boxed_view_ext())
}
fn share_url(&self) -> Option<String> {

View File

@@ -222,7 +222,7 @@ impl ListItem for Artist {
}
fn open(&self, queue: Arc<Queue>, library: Arc<Library>) -> Option<Box<dyn ViewExt>> {
Some(ArtistView::new(queue, library, self).as_boxed_view_ext())
Some(ArtistView::new(queue, library, self).into_boxed_view_ext())
}
fn share_url(&self) -> Option<String> {

View File

@@ -228,7 +228,7 @@ impl CommandManager {
s.call_on_name("main", |v: &mut Layout| {
v.set_screen("search");
if let Some(results) = view {
v.push_view(results.as_boxed_view_ext())
v.push_view(results.into_boxed_view_ext())
}
});
Ok(None)

View File

@@ -104,7 +104,7 @@ impl Library {
self.playlists()
.iter()
.find(|local| local.id == remote.id)
.and_then(|local| Some(local.snapshot_id != remote.snapshot_id))
.map(|local| local.snapshot_id != remote.snapshot_id)
.unwrap_or(true)
}

View File

@@ -305,7 +305,7 @@ impl ListItem for Playlist {
}
fn open(&self, queue: Arc<Queue>, library: Arc<Library>) -> Option<Box<dyn ViewExt>> {
Some(PlaylistView::new(queue, library, self).as_boxed_view_ext())
Some(PlaylistView::new(queue, library, self).into_boxed_view_ext())
}
fn share_url(&self) -> Option<String> {

View File

@@ -155,7 +155,7 @@ impl ListItem for Show {
}
fn open(&self, queue: Arc<Queue>, library: Arc<Library>) -> Option<Box<dyn ViewExt>> {
Some(ShowView::new(queue, library, self).as_boxed_view_ext())
Some(ShowView::new(queue, library, self).into_boxed_view_ext())
}
fn share_url(&self) -> Option<String> {

View File

@@ -269,7 +269,7 @@ impl ListItem for Track {
self.artists.join(", "),
self.title
))
.as_boxed_view_ext()
.into_boxed_view_ext()
})
}

View File

@@ -77,11 +77,11 @@ impl<V: ViewExt> ViewExt for NamedView<V> {
}
pub trait IntoBoxedViewExt {
fn as_boxed_view_ext(self) -> Box<dyn ViewExt>;
fn into_boxed_view_ext(self) -> Box<dyn ViewExt>;
}
impl<V: ViewExt> IntoBoxedViewExt for V {
fn as_boxed_view_ext(self) -> Box<dyn ViewExt> {
fn into_boxed_view_ext(self) -> Box<dyn ViewExt> {
Box::new(self)
}
}

View File

@@ -262,7 +262,7 @@ impl ViewExt for CoverView {
GotoMode::Album => {
if let Some(album) = track.album(queue.clone()) {
let view =
AlbumView::new(queue, library, &album).as_boxed_view_ext();
AlbumView::new(queue, library, &album).into_boxed_view_ext();
return Ok(CommandResult::View(view));
}
}
@@ -274,7 +274,7 @@ impl ViewExt for CoverView {
// the cover image really doesn't play nice with the menu
_ => {
let view = ArtistView::new(queue, library, &artists[0])
.as_boxed_view_ext();
.into_boxed_view_ext();
Ok(CommandResult::View(view))
}
};

View File

@@ -75,7 +75,7 @@ impl Layout {
}
let s = id.into();
self.screens.insert(s.clone(), view.as_boxed_view_ext());
self.screens.insert(s.clone(), view.into_boxed_view_ext());
self.stack.insert(s.clone(), Vec::new());
self.focus = Some(s);
}

View File

@@ -496,7 +496,7 @@ impl<I: ListItem + Clone> ViewExt for ListView<I> {
GotoMode::Album => {
if let Some(album) = item.album(queue.clone()) {
let view =
AlbumView::new(queue, library, &album).as_boxed_view_ext();
AlbumView::new(queue, library, &album).into_boxed_view_ext();
return Ok(CommandResult::View(view));
}
}
@@ -506,7 +506,7 @@ impl<I: ListItem + Clone> ViewExt for ListView<I> {
0 => Ok(CommandResult::Consumed(None)),
1 => {
let view = ArtistView::new(queue, library, &artists[0])
.as_boxed_view_ext();
.into_boxed_view_ext();
Ok(CommandResult::View(view))
}
_ => {

View File

@@ -35,7 +35,7 @@ impl TabView {
pub fn add_tab<S: Into<String>, V: IntoBoxedViewExt>(&mut self, id: S, title: S, view: V) {
let tab = Tab {
title: title.into(),
view: view.as_boxed_view_ext(),
view: view.into_boxed_view_ext(),
};
self.tabs.push(tab);
self.ids.insert(id.into(), self.tabs.len() - 1);