Skip to content

Commit d965c4c

Browse files
committed
Remove clippy fixes
1 parent 2263fe0 commit d965c4c

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

dsc/src/resolve.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,21 +82,21 @@ pub fn get_contents(input: &str) -> Result<(Option<String>, String), String> {
8282
}
8383
},
8484
Err(err) => {
85-
return Err(format!("{} '{}': {err}", t!("resolve.failedToOpenFile"), include_path.display()));
85+
return Err(format!("{} '{include_path:?}': {err}", t!("resolve.failedToOpenFile")));
8686
}
8787
}
8888
// convert the buffer to a string
8989
let include_content = match String::from_utf8(buffer) {
9090
Ok(input) => input,
9191
Err(err) => {
92-
return Err(format!("{} '{}': {err}", t!("resolve.invalidFileContent"), include_path.display()));
92+
return Err(format!("{} '{include_path:?}': {err}", t!("resolve.invalidFileContent")));
9393
}
9494
};
9595

9696
match parse_input_to_json(&include_content) {
9797
Ok(json) => json,
9898
Err(err) => {
99-
return Err(format!("{} '{}': {err}", t!("resolve.invalidFile"), include_path.display()));
99+
return Err(format!("{} '{include_path:?}': {err}", t!("resolve.invalidFile")));
100100
}
101101
}
102102
},
@@ -120,13 +120,13 @@ pub fn get_contents(input: &str) -> Result<(Option<String>, String), String> {
120120
let parameters_json = match parse_input_to_json(&parameters) {
121121
Ok(json) => json,
122122
Err(err) => {
123-
return Err(format!("{} '{}': {err}", t!("resolve.failedParseParametersFile"), parameters_file.display()));
123+
return Err(format!("{} '{parameters_file:?}': {err}", t!("resolve.failedParseParametersFile")));
124124
}
125125
};
126126
Some(parameters_json)
127127
},
128128
Err(err) => {
129-
return Err(format!("{} '{}': {err}", t!("resolve.couldNotReadParametersFile"), parameters_file.display()));
129+
return Err(format!("{} '{parameters_file:?}': {err}", t!("resolve.couldNotReadParametersFile")));
130130
}
131131
}
132132
},

dsc_lib/src/discovery/command_discovery.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ pub fn load_manifest(path: &Path) -> Result<ImportedManifest, DscError> {
619619
let manifest = match serde_yaml::from_str::<ExtensionManifest>(&contents) {
620620
Ok(manifest) => manifest,
621621
Err(err) => {
622-
return Err(DscError::Validation(format!("Invalid manifest {} version value: {err}", path.display())));
622+
return Err(DscError::Validation(format!("Invalid manifest {path:?} version value: {err}")));
623623
}
624624
};
625625
let extension = load_extension_manifest(path, &manifest)?;
@@ -628,7 +628,7 @@ pub fn load_manifest(path: &Path) -> Result<ImportedManifest, DscError> {
628628

629629
fn load_resource_manifest(path: &Path, manifest: &ResourceManifest) -> Result<DscResource, DscError> {
630630
if let Err(err) = validate_semver(&manifest.version) {
631-
return Err(DscError::Validation(format!("Invalid manifest {} version value: {err}", path.display())));
631+
return Err(DscError::Validation(format!("Invalid manifest {path:?} version value: {err}")));
632632
}
633633

634634
let kind = if let Some(kind) = manifest.kind.clone() {
@@ -693,7 +693,7 @@ fn load_resource_manifest(path: &Path, manifest: &ResourceManifest) -> Result<Ds
693693

694694
fn load_extension_manifest(path: &Path, manifest: &ExtensionManifest) -> Result<DscExtension, DscError> {
695695
if let Err(err) = validate_semver(&manifest.version) {
696-
return Err(DscError::Validation(format!("Invalid manifest {} version value: {err}", path.display())));
696+
return Err(DscError::Validation(format!("Invalid manifest {path:?} version value: {err}")));
697697
}
698698

699699
let mut capabilities: Vec<dscextension::Capability> = vec![];

process/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fn get_task_list() -> Vec<ProcessInfo>
1616
for (pid, process) in s.processes() {
1717
let mut p = ProcessInfo::new();
1818
p.pid = pid.as_u32();
19-
p.name = format!("{:?}", process.name().display());
19+
p.name = format!("{:?}", process.name());
2020
p.cmdline = format!("{:?}", process.cmd());
2121
result.push(p);
2222
}

0 commit comments

Comments
 (0)