Skip to content

Commit 6ca3cc6

Browse files
committed
rustfmt
1 parent 1235902 commit 6ca3cc6

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

src/download.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -691,10 +691,8 @@ impl<'a> Downloader<'a> {
691691
return Ok(video_path.to_owned());
692692
} else {
693693
fs::remove_file(audio_path)?;
694-
return Err(GertError::FfmpegError("Failed to merge audio and video".into()))
694+
return Err(GertError::FfmpegError("Failed to merge audio and video".into()));
695695
}
696-
697-
698696
}
699697

700698
fn get_filename(&self, task: &DownloadTask) -> String {

src/main.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,8 @@ async fn main() -> Result<(), GertError> {
302302
posts.push(post);
303303
} else {
304304
for subreddit in &subreddits {
305-
let subposts = Subreddit::new(subreddit, &session).get_posts(feed, limit, period).await?;
305+
let subposts =
306+
Subreddit::new(subreddit, &session).get_posts(feed, limit, period).await?;
306307
posts.extend(
307308
subposts
308309
.into_iter()

src/subreddit.rs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ impl Subreddit<'_> {
1616
pub fn new<'a>(name: &'a str, session: &'a Client) -> Subreddit<'a> {
1717
let subreddit_url = format!("https://www.reddit.com/r/{}", name);
1818

19-
Subreddit { name: name.to_owned(), url: subreddit_url, client:session }
19+
Subreddit { name: name.to_owned(), url: subreddit_url, client: session }
2020
}
2121

2222
async fn get_feed(
@@ -37,7 +37,15 @@ impl Subreddit<'_> {
3737
}
3838
let url = &url.to_owned();
3939
debug!("Fetching posts from {}]", url);
40-
Ok(self.client.get(url).send().await.expect("Bad response").json::<Listing>().await.expect("Failed to parse JSON"))
40+
Ok(self
41+
.client
42+
.get(url)
43+
.send()
44+
.await
45+
.expect("Bad response")
46+
.json::<Listing>()
47+
.await
48+
.expect("Failed to parse JSON"))
4149
// Ok(self.client.get(url).send().await.expect("Bad response").json::<Listing>().await.expect("Failed to parse JSON"))
4250
}
4351

src/utils.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ pub fn parse_env_file(path: &str) -> Result<UserEnv, GertError> {
7474
env.load_override();
7575
}
7676

77-
7877
let client_id = env::var("CLIENT_ID")?;
7978
let client_secret = env::var("CLIENT_SECRET")?;
8079
let username = env::var("USERNAME")?;

0 commit comments

Comments
 (0)