diff options
| -rw-r--r-- | src/librustc/middle/dependency_format.rs | 10 | ||||
| -rw-r--r-- | src/test/compile-fail/cdylib-deps-must-be-static.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/rmeta_lib.rs | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/librustc/middle/dependency_format.rs b/src/librustc/middle/dependency_format.rs index 41fcce27bc5..db0ecb6aa5e 100644 --- a/src/librustc/middle/dependency_format.rs +++ b/src/librustc/middle/dependency_format.rs @@ -161,7 +161,8 @@ fn calculate_type<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, if tcx.dep_kind(cnum).macros_only() { continue } let src = tcx.used_crate_source(cnum); if src.rlib.is_some() { continue } - sess.err(&format!("dependency `{}` not found in rlib format", + sess.err(&format!("crate `{}` required to be available in rlib format, \ + but was not found in this form", tcx.crate_name(cnum))); } return Vec::new(); @@ -244,10 +245,9 @@ fn calculate_type<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, Linkage::Static => "rlib", _ => "dylib", }; - let name = tcx.crate_name(cnum); - sess.err(&format!("crate `{}` required to be available in {}, \ - but it was not available in this form", - name, kind)); + sess.err(&format!("crate `{}` required to be available in {} format, \ + but was not found in this form", + tcx.crate_name(cnum), kind)); } } } diff --git a/src/test/compile-fail/cdylib-deps-must-be-static.rs b/src/test/compile-fail/cdylib-deps-must-be-static.rs index 853507cbc6d..bf7189c21fb 100644 --- a/src/test/compile-fail/cdylib-deps-must-be-static.rs +++ b/src/test/compile-fail/cdylib-deps-must-be-static.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// error-pattern: dependency `cdylib_dep` not found in rlib format +// error-pattern: crate `cdylib_dep` required to be available in rlib format, but was not found // aux-build:cdylib-dep.rs // ignore-musl // ignore-emscripten diff --git a/src/test/compile-fail/rmeta_lib.rs b/src/test/compile-fail/rmeta_lib.rs index 3b7d1f3cc90..a61ff05e8c8 100644 --- a/src/test/compile-fail/rmeta_lib.rs +++ b/src/test/compile-fail/rmeta_lib.rs @@ -10,7 +10,7 @@ // aux-build:rmeta_meta.rs // no-prefer-dynamic -// error-pattern: crate `rmeta_meta` required to be available in rlib, but it was not available +// error-pattern: crate `rmeta_meta` required to be available in rlib format, but was not found // Check that building a non-metadata crate fails if a dependent crate is // metadata-only. |