Skip to content

Commit c96a6d8

Browse files
Skglandsyphar
authored andcommitted
rename PrepareError::Unknown to PrepareError::Uncategorized
to match std::io::ErrorKind::Uncategorized
1 parent e40026e commit c96a6d8

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

src/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ impl BuildDirectory {
196196
let mut prepare = Prepare::new(&self.workspace, toolchain, krate, &source_dir, patches);
197197
prepare.prepare().map_err(|err| {
198198
if err.downcast_ref::<PrepareError>().is_none() {
199-
err.context(PrepareError::Unknown)
199+
err.context(PrepareError::Uncategorized)
200200
} else {
201201
err
202202
}

src/prepare.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -390,10 +390,10 @@ pub enum PrepareError {
390390
/// Some of the dependencies do not exist anymore.
391391
#[error("the crate depends on missing dependencies: \n\n{0}")]
392392
MissingDependencies(String),
393-
/// Some not further detaild error
393+
/// Uncategorized error
394394
#[doc(hidden)]
395-
#[error("prepare failed without further details")]
396-
Unknown,
395+
#[error("uncategorized prepare error")]
396+
Uncategorized,
397397
}
398398

399399
#[cfg(test)]

tests/buildtest/mod.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -261,42 +261,42 @@ test_prepare_error_stderr!(
261261
"error: no matching package named `macro` found"
262262
);
263263

264-
test_prepare_unknown_err!(
264+
test_prepare_uncategorized_err!(
265265
test_invalid_cargotoml_content_deps,
266266
"invalid-cargotoml-content-deps",
267267
BrokenDependencies,
268268
"failed to parse the version requirement `0.11\t` for dependency `parking_lot`"
269269
);
270270

271-
test_prepare_unknown_err!(
271+
test_prepare_uncategorized_err!(
272272
test_invalid_cargotoml_syntax_deps,
273273
"invalid-cargotoml-syntax-deps",
274274
BrokenDependencies,
275275
"error: invalid table header"
276276
);
277277

278-
test_prepare_unknown_err!(
278+
test_prepare_uncategorized_err!(
279279
test_invalid_lockfile_syntax,
280280
"invalid-lockfile-syntax",
281281
InvalidCargoLock,
282282
"error: failed to parse lock file at"
283283
);
284284

285-
test_prepare_unknown_err!(
285+
test_prepare_uncategorized_err!(
286286
test_missing_deps_typo,
287287
"missing-deps-typo",
288288
MissingDependencies,
289289
"error: no matching package found"
290290
);
291291

292-
test_prepare_unknown_err!(
292+
test_prepare_uncategorized_err!(
293293
test_invalid_cargotoml_cyclic_feature,
294294
"invalid-cargotoml-cyclic-feature",
295295
BrokenDependencies,
296296
"error: cyclic feature dependency: feature"
297297
);
298298

299-
test_prepare_unknown_err!(
299+
test_prepare_uncategorized_err!(
300300
test_invalid_cargotoml_cyclic_package,
301301
"invalid-cargotoml-cyclic-package",
302302
BrokenDependencies,
@@ -309,42 +309,42 @@ test_prepare_error!(
309309
InvalidCargoTomlSyntax
310310
);
311311

312-
test_prepare_unknown_err!(
312+
test_prepare_uncategorized_err!(
313313
test_invalid_cargotoml_missing_override,
314314
"invalid-cargotoml-missing-override",
315315
MissingDependencies,
316316
"no matching package for override `https://github.com/rust-lang/crates.io-index#[email protected]` found"
317317
);
318318

319-
test_prepare_unknown_err!(
319+
test_prepare_uncategorized_err!(
320320
test_missing_deps_registry_version,
321321
"missing-deps-registry-version",
322322
MissingDependencies,
323323
"error: failed to select a version for the requirement `empty-library = \"=0.5.0\"`"
324324
);
325325

326-
test_prepare_unknown_err!(
326+
test_prepare_uncategorized_err!(
327327
test_invalid_cargotoml_content_type_in_deps,
328328
"invalid-cargotoml-content-type-in-deps",
329329
BrokenDependencies,
330330
"error: invalid type: map, expected a string"
331331
);
332332

333-
test_prepare_unknown_err!(
333+
test_prepare_uncategorized_err!(
334334
test_invalid_cargotoml_conflicting_links,
335335
"invalid-cargotoml-conflicting-links",
336336
InvalidCargoLock,
337337
"error: Attempting to resolve a dependency with more than one crate with links=ring-asm"
338338
);
339339

340-
test_prepare_unknown_err!(
340+
test_prepare_uncategorized_err!(
341341
test_lockfile_collision,
342342
"lockfile-collision",
343343
BrokenDependencies,
344344
"error: package collision in the lockfile: packages lockfile-collision v0.1.0 "
345345
);
346346

347-
test_prepare_unknown_err!(
347+
test_prepare_uncategorized_err!(
348348
test_invalid_cargotoml_missing_patch,
349349
"invalid-cargotoml-missing-patch",
350350
MissingDependencies,

tests/buildtest/runner.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ macro_rules! test_prepare_error_stderr {
131131
};
132132
}
133133

134-
macro_rules! test_prepare_unknown_err {
134+
macro_rules! test_prepare_uncategorized_err {
135135
($name:ident, $krate:expr, $expected:ident $(,$expected_output:expr)?) => {
136136
$crate::buildtest::runner::test_prepare_error!($name, $krate, Unknown);
137137
};

0 commit comments

Comments
 (0)