Skip to content

Commit 1b1bc91

Browse files
committed
Fix clippy
1 parent bcae68a commit 1b1bc91

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

dsc/src/resolve.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,26 +77,26 @@ pub fn get_contents(input: &str) -> Result<(Option<String>, String), String> {
7777
match file.read_to_end(&mut buffer) {
7878
Ok(_) => (),
7979
Err(err) => {
80-
return Err(format!("{} '{include_path:?}': {err}", t!("resolve.failedToReadFile")));
80+
return Err(format!("{} '{}': {err}", t!("resolve.failedToReadFile"), include_path.display()));
8181
}
8282
}
8383
},
8484
Err(err) => {
85-
return Err(format!("{} '{include_path:?}': {err}", t!("resolve.failedToOpenFile")));
85+
return Err(format!("{} '{}': {err}", t!("resolve.failedToOpenFile"), include_path.display()));
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!("{} '{include_path:?}': {err}", t!("resolve.invalidFileContent")));
92+
return Err(format!("{} '{}': {err}", t!("resolve.invalidFileContent"), include_path.display()));
9393
}
9494
};
9595

9696
match parse_input_to_json(&include_content) {
9797
Ok(json) => json,
9898
Err(err) => {
99-
return Err(format!("{} '{include_path:?}': {err}", t!("resolve.invalidFile")));
99+
return Err(format!("{} '{}': {err}", t!("resolve.invalidFile"), include_path.display()));
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!("{} '{parameters_file:?}': {err}", t!("resolve.failedParseParametersFile")));
123+
return Err(format!("{} '{}': {err}", t!("resolve.failedParseParametersFile"), parameters_file.display()));
124124
}
125125
};
126126
Some(parameters_json)
127127
},
128128
Err(err) => {
129-
return Err(format!("{} '{parameters_file:?}': {err}", t!("resolve.couldNotReadParametersFile")));
129+
return Err(format!("{} '{}': {err}", t!("resolve.couldNotReadParametersFile"), parameters_file.display()));
130130
}
131131
}
132132
},
@@ -154,7 +154,7 @@ fn normalize_path(path: &Path) -> Result<PathBuf, String> {
154154
} else {
155155
// check that no components of the path are '..'
156156
if path.components().any(|c| c == std::path::Component::ParentDir) {
157-
return Err(format!("{}: {path:?}", t!("resolve.invalidPath")));
157+
return Err(format!("{}: {}", t!("resolve.invalidPath"), path.display()));
158158
}
159159

160160
// use DSC_CONFIG_ROOT env var as current directory

0 commit comments

Comments
 (0)