rust 1.80 clippy fixes

Author: extrawurst

asyncgit/src/asyncjob/mod.rs

@@ -92,7 +92,7 @@ impl<J: 'static + AsyncJob> AsyncSingleJob<J> {
 	}
 
 	/// makes sure `next` is cleared and returns `true` if it actually canceled something
-	pub fn cancel(&mut self) -> bool {
+	pub fn cancel(&self) -> bool {
 		if let Ok(mut next) = self.next.lock() {
 			if next.is_some() {
 				*next = None;
@@ -111,7 +111,7 @@ impl<J: 'static + AsyncJob> AsyncSingleJob<J> {
 	/// spawns `task` if nothing is running currently,
 	/// otherwise schedules as `next` overwriting if `next` was set before.
 	/// return `true` if the new task gets started right away.
-	pub fn spawn(&mut self, task: J) -> bool {
+	pub fn spawn(&self, task: J) -> bool {
 		self.schedule_next(task);
 		self.check_for_job()
 	}
@@ -162,7 +162,7 @@ impl<J: 'static + AsyncJob> AsyncSingleJob<J> {
 		Ok(())
 	}
 
-	fn schedule_next(&mut self, task: J) {
+	fn schedule_next(&self, task: J) {
 		if let Ok(mut next) = self.next.lock() {
 			*next = Some(task);
 		}
@@ -226,7 +226,7 @@ mod test {
 	fn test_overwrite() {
 		let (sender, receiver) = unbounded();
 
-		let mut job: AsyncSingleJob<TestJob> =
+		let job: AsyncSingleJob<TestJob> =
 			AsyncSingleJob::new(sender);
 
 		let task = TestJob {
@@ -265,7 +265,7 @@ mod test {
 	fn test_cancel() {
 		let (sender, receiver) = unbounded();
 
-		let mut job: AsyncSingleJob<TestJob> =
+		let job: AsyncSingleJob<TestJob> =
 			AsyncSingleJob::new(sender);
 
 		let task = TestJob {

asyncgit/src/blame.rs

@@ -55,9 +55,7 @@ impl AsyncBlame {
 	}
 
 	///
-	pub fn last(
-		&mut self,
-	) -> Result<Option<(BlameParams, FileBlame)>> {
+	pub fn last(&self) -> Result<Option<(BlameParams, FileBlame)>> {
 		let last = self.last.lock()?;
 
 		Ok(last.clone().map(|last_result| {
@@ -66,7 +64,7 @@ impl AsyncBlame {
 	}
 
 	///
-	pub fn refresh(&mut self) -> Result<()> {
+	pub fn refresh(&self) -> Result<()> {
 		if let Ok(Some(param)) = self.get_last_param() {
 			self.clear_current()?;
 			self.request(param)?;
@@ -81,7 +79,7 @@ impl AsyncBlame {
 
 	///
 	pub fn request(
-		&mut self,
+		&self,
 		params: BlameParams,
 	) -> Result<Option<FileBlame>> {
 		log::trace!("request");
@@ -181,7 +179,7 @@ impl AsyncBlame {
 			.map(|last_result| last_result.params))
 	}
 
-	fn clear_current(&mut self) -> Result<()> {
+	fn clear_current(&self) -> Result<()> {
 		let mut current = self.current.lock()?;
 		current.0 = 0;
 		current.1 = None;

asyncgit/src/commit_files.rs

@@ -70,7 +70,7 @@ impl AsyncCommitFiles {
 
 	///
 	pub fn current(
-		&mut self,
+		&self,
 	) -> Result<Option<(CommitFilesParams, ResultType)>> {
 		let c = self.current.lock()?;
 
@@ -84,7 +84,7 @@ impl AsyncCommitFiles {
 	}
 
 	///
-	pub fn fetch(&mut self, params: CommitFilesParams) -> Result<()> {
+	pub fn fetch(&self, params: CommitFilesParams) -> Result<()> {
 		if self.is_pending() {
 			return Ok(());
 		}

asyncgit/src/diff.rs

@@ -73,14 +73,14 @@ impl AsyncDiff {
 	}
 
 	///
-	pub fn last(&mut self) -> Result<Option<(DiffParams, FileDiff)>> {
+	pub fn last(&self) -> Result<Option<(DiffParams, FileDiff)>> {
 		let last = self.last.lock()?;
 
 		Ok(last.clone().map(|res| (res.params, res.result)))
 	}
 
 	///
-	pub fn refresh(&mut self) -> Result<()> {
+	pub fn refresh(&self) -> Result<()> {
 		if let Ok(Some(param)) = self.get_last_param() {
 			self.clear_current()?;
 			self.request(param)?;
@@ -95,7 +95,7 @@ impl AsyncDiff {
 
 	///
 	pub fn request(
-		&mut self,
+		&self,
 		params: DiffParams,
 	) -> Result<Option<FileDiff>> {
 		log::trace!("request {:?}", params);
@@ -212,7 +212,7 @@ impl AsyncDiff {
 		Ok(self.last.lock()?.clone().map(|e| e.params))
 	}
 
-	fn clear_current(&mut self) -> Result<()> {
+	fn clear_current(&self) -> Result<()> {
 		let mut current = self.current.lock()?;
 		current.0 = 0;
 		current.1 = None;

asyncgit/src/pull.rs

@@ -71,7 +71,7 @@ impl AsyncPull {
 	}
 
 	///
-	pub fn request(&mut self, params: FetchRequest) -> Result<()> {
+	pub fn request(&self, params: FetchRequest) -> Result<()> {
 		log::trace!("request");
 
 		if self.is_pending()? {

asyncgit/src/push.rs

@@ -78,7 +78,7 @@ impl AsyncPush {
 	}
 
 	///
-	pub fn request(&mut self, params: PushRequest) -> Result<()> {
+	pub fn request(&self, params: PushRequest) -> Result<()> {
 		log::trace!("request");
 
 		if self.is_pending()? {

asyncgit/src/push_tags.rs

@@ -69,7 +69,7 @@ impl AsyncPushTags {
 	}
 
 	///
-	pub fn request(&mut self, params: PushTagsRequest) -> Result<()> {
+	pub fn request(&self, params: PushTagsRequest) -> Result<()> {
 		log::trace!("request");
 
 		if self.is_pending()? {

asyncgit/src/revlog.rs

@@ -126,7 +126,7 @@ impl AsyncLog {
 	}
 
 	///
-	pub fn set_background(&mut self) {
+	pub fn set_background(&self) {
 		self.background.store(true, Ordering::Relaxed);
 	}
 
@@ -146,7 +146,7 @@ impl AsyncLog {
 	}
 
 	///
-	pub fn fetch(&mut self) -> Result<FetchStatus> {
+	pub fn fetch(&self) -> Result<FetchStatus> {
 		self.background.store(false, Ordering::Relaxed);
 
 		if self.is_pending() {
@@ -308,7 +308,7 @@ impl AsyncLog {
 		Ok(())
 	}
 
-	fn clear(&mut self) -> Result<()> {
+	fn clear(&self) -> Result<()> {
 		self.current.lock()?.commits.clear();
 		*self.current_head.lock()? = None;
 		self.partial_extract.store(false, Ordering::Relaxed);

asyncgit/src/status.rs

@@ -77,7 +77,7 @@ impl AsyncStatus {
 	}
 
 	///
-	pub fn last(&mut self) -> Result<Status> {
+	pub fn last(&self) -> Result<Status> {
 		let last = self.last.lock()?;
 		Ok(last.clone())
 	}
@@ -89,7 +89,7 @@ impl AsyncStatus {
 
 	///
 	pub fn fetch(
-		&mut self,
+		&self,
 		params: &StatusParams,
 	) -> Result<Option<Status>> {
 		if self.is_pending() {

asyncgit/src/sync/blame.rs

@@ -167,7 +167,7 @@ mod tests {
 		let repo_path: &RepoPath =
 			&root.as_os_str().to_str().unwrap().into();
 
-		assert!(matches!(blame_file(repo_path, "foo", None), Err(_)));
+		assert!(blame_file(repo_path, "foo", None).is_err());
 
 		File::create(root.join(file_path))?.write_all(b"line 1\n")?;