Skip to content

Commit 7290c5e

Browse files
authored
chore: apply clippy for rust 1.76 & bump msrv (starship#5763)
1 parent 7485c90 commit 7290c5e

File tree

5 files changed

+22
-18
lines changed

5 files changed

+22
-18
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ license = "ISC"
2323
readme = "README.md"
2424
repository = "https://github.com/starship/starship"
2525
# Note: MSRV is only intended as a hint, and only the latest version is officially supported in starship.
26-
rust-version = "1.65"
26+
rust-version = "1.71"
2727
description = """
2828
The minimal, blazing-fast, and infinitely customizable prompt for any shell! ☄🌌️
2929
"""

src/context.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -339,10 +339,8 @@ impl<'a> Context<'a> {
339339
);
340340

341341
let branch = get_current_branch(&repository);
342-
let remote = get_remote_repository_info(
343-
&repository,
344-
branch.as_ref().map(|name| name.as_ref()),
345-
);
342+
let remote =
343+
get_remote_repository_info(&repository, branch.as_ref().map(AsRef::as_ref));
346344
let path = repository.path().to_path_buf();
347345

348346
let fs_monitor_value_is_true = repository

src/modules/direnv.rs

+16-10
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@ impl FromStr for DirenvState {
8585

8686
fn from_str(s: &str) -> Result<Self, Self::Err> {
8787
match serde_json::from_str::<RawDirenvState>(s) {
88-
Ok(raw) => Ok(DirenvState {
88+
Ok(raw) => Ok(Self {
8989
rc_path: raw.state.found_rc.path,
9090
allowed: raw.state.found_rc.allowed.try_into()?,
9191
loaded: matches!(
9292
raw.state.loaded_rc.allowed.try_into()?,
9393
AllowStatus::Allowed
9494
),
9595
}),
96-
Err(_) => DirenvState::from_lines(s),
96+
Err(_) => Self::from_lines(s),
9797
}
9898
}
9999
}
@@ -225,7 +225,7 @@ mod tests {
225225
let dir = tempfile::tempdir()?;
226226
let rc_path = dir.path().join(".envrc");
227227

228-
std::fs::File::create(&rc_path)?.sync_all()?;
228+
std::fs::File::create(rc_path)?.sync_all()?;
229229

230230
let renderer = ModuleRenderer::new("direnv")
231231
.config(toml::toml! {
@@ -242,7 +242,7 @@ mod tests {
242242
);
243243

244244
assert_eq!(
245-
Some(format!("direnv not loaded/allowed ")),
245+
Some("direnv not loaded/allowed ".to_string()),
246246
renderer.collect()
247247
);
248248

@@ -281,7 +281,7 @@ mod tests {
281281
let dir = tempfile::tempdir()?;
282282
let rc_path = dir.path().join(".envrc");
283283

284-
std::fs::File::create(&rc_path)?.sync_all()?;
284+
std::fs::File::create(rc_path)?.sync_all()?;
285285

286286
let renderer = ModuleRenderer::new("direnv")
287287
.config(toml::toml! {
@@ -297,7 +297,10 @@ mod tests {
297297
}),
298298
);
299299

300-
assert_eq!(Some(format!("direnv loaded/allowed ")), renderer.collect());
300+
assert_eq!(
301+
Some("direnv loaded/allowed ".to_string()),
302+
renderer.collect()
303+
);
301304

302305
dir.close()
303306
}
@@ -334,7 +337,7 @@ mod tests {
334337
let dir = tempfile::tempdir()?;
335338
let rc_path = dir.path().join(".envrc");
336339

337-
std::fs::File::create(&rc_path)?.sync_all()?;
340+
std::fs::File::create(rc_path)?.sync_all()?;
338341

339342
let renderer = ModuleRenderer::new("direnv")
340343
.config(toml::toml! {
@@ -350,7 +353,10 @@ mod tests {
350353
}),
351354
);
352355

353-
assert_eq!(Some(format!("direnv loaded/denied ")), renderer.collect());
356+
assert_eq!(
357+
Some("direnv loaded/denied ".to_string()),
358+
renderer.collect()
359+
);
354360

355361
dir.close()
356362
}
@@ -359,7 +365,7 @@ mod tests {
359365
let dir = tempfile::tempdir()?;
360366
let rc_path = dir.path().join(".envrc");
361367

362-
std::fs::File::create(&rc_path)?.sync_all()?;
368+
std::fs::File::create(rc_path)?.sync_all()?;
363369

364370
let renderer = ModuleRenderer::new("direnv")
365371
.config(toml::toml! {
@@ -376,7 +382,7 @@ mod tests {
376382
);
377383

378384
assert_eq!(
379-
Some(format!("direnv loaded/not allowed ")),
385+
Some("direnv loaded/not allowed ".to_string()),
380386
renderer.collect()
381387
);
382388

src/modules/dotnet.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -270,15 +270,15 @@ fn get_local_dotnet_files(context: &Context) -> Result<Vec<DotNetFile>, std::io:
270270
fn get_dotnet_file_type(path: &Path) -> Option<FileType> {
271271
let file_name_lower = map_str_to_lower(path.file_name());
272272

273-
match file_name_lower.as_ref().map(std::convert::AsRef::as_ref) {
273+
match file_name_lower.as_ref().map(AsRef::as_ref) {
274274
Some(GLOBAL_JSON_FILE) => return Some(FileType::GlobalJson),
275275
Some(PROJECT_JSON_FILE) => return Some(FileType::ProjectJson),
276276
_ => (),
277277
};
278278

279279
let extension_lower = map_str_to_lower(path.extension());
280280

281-
match extension_lower.as_ref().map(std::convert::AsRef::as_ref) {
281+
match extension_lower.as_ref().map(AsRef::as_ref) {
282282
Some("sln") => return Some(FileType::SolutionFile),
283283
Some("csproj" | "fsproj" | "xproj") => return Some(FileType::ProjectFile),
284284
Some("props" | "targets") => return Some(FileType::MsBuildFile),

src/utils.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ pub fn display_command<T: AsRef<OsStr> + Debug, U: AsRef<OsStr> + Debug>(
136136
args: &[U],
137137
) -> String {
138138
std::iter::once(cmd.as_ref())
139-
.chain(args.iter().map(std::convert::AsRef::as_ref))
139+
.chain(args.iter().map(AsRef::as_ref))
140140
.map(|i| i.to_string_lossy().into_owned())
141141
.collect::<Vec<String>>()
142142
.join(" ")

0 commit comments

Comments
 (0)