@@ -77,26 +77,26 @@ pub fn get_contents(input: &str) -> Result<(Option<String>, String), String> {
77
77
match file. read_to_end ( & mut buffer) {
78
78
Ok ( _) => ( ) ,
79
79
Err ( err) => {
80
- return Err ( format ! ( "{} '{include_path:? }': {err}" , t!( "resolve.failedToReadFile" ) ) ) ;
80
+ return Err ( format ! ( "{} '{}': {err}" , t!( "resolve.failedToReadFile" ) , include_path . display ( ) ) ) ;
81
81
}
82
82
}
83
83
} ,
84
84
Err ( err) => {
85
- return Err ( format ! ( "{} '{include_path:? }': {err}" , t!( "resolve.failedToOpenFile" ) ) ) ;
85
+ return Err ( format ! ( "{} '{}': {err}" , t!( "resolve.failedToOpenFile" ) , include_path . display ( ) ) ) ;
86
86
}
87
87
}
88
88
// convert the buffer to a string
89
89
let include_content = match String :: from_utf8 ( buffer) {
90
90
Ok ( input) => input,
91
91
Err ( err) => {
92
- return Err ( format ! ( "{} '{include_path:? }': {err}" , t!( "resolve.invalidFileContent" ) ) ) ;
92
+ return Err ( format ! ( "{} '{}': {err}" , t!( "resolve.invalidFileContent" ) , include_path . display ( ) ) ) ;
93
93
}
94
94
} ;
95
95
96
96
match parse_input_to_json ( & include_content) {
97
97
Ok ( json) => json,
98
98
Err ( err) => {
99
- return Err ( format ! ( "{} '{include_path:? }': {err}" , t!( "resolve.invalidFile" ) ) ) ;
99
+ return Err ( format ! ( "{} '{}': {err}" , t!( "resolve.invalidFile" ) , include_path . display ( ) ) ) ;
100
100
}
101
101
}
102
102
} ,
@@ -120,13 +120,13 @@ pub fn get_contents(input: &str) -> Result<(Option<String>, String), String> {
120
120
let parameters_json = match parse_input_to_json ( & parameters) {
121
121
Ok ( json) => json,
122
122
Err ( err) => {
123
- return Err ( format ! ( "{} '{parameters_file:? }': {err}" , t!( "resolve.failedParseParametersFile" ) ) ) ;
123
+ return Err ( format ! ( "{} '{}': {err}" , t!( "resolve.failedParseParametersFile" ) , parameters_file . display ( ) ) ) ;
124
124
}
125
125
} ;
126
126
Some ( parameters_json)
127
127
} ,
128
128
Err ( err) => {
129
- return Err ( format ! ( "{} '{parameters_file:? }': {err}" , t!( "resolve.couldNotReadParametersFile" ) ) ) ;
129
+ return Err ( format ! ( "{} '{}': {err}" , t!( "resolve.couldNotReadParametersFile" ) , parameters_file . display ( ) ) ) ;
130
130
}
131
131
}
132
132
} ,
@@ -154,7 +154,7 @@ fn normalize_path(path: &Path) -> Result<PathBuf, String> {
154
154
} else {
155
155
// check that no components of the path are '..'
156
156
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 ( ) ) ) ;
158
158
}
159
159
160
160
// use DSC_CONFIG_ROOT env var as current directory
0 commit comments