diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-11-17 16:09:14 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-11-17 20:12:50 +0300 |
| commit | 0aed810abf6f37d478965024fdbeffee2759794c (patch) | |
| tree | ce1ce43783246dcab1b525c56eb78560fd414b69 | |
| parent | ff3e06fbe67264eab91743bba61024598b9a4b1e (diff) | |
rustc_metadata: Minor cleanup
| -rw-r--r-- | src/librustc_metadata/creader.rs | 2 | ||||
| -rw-r--r-- | src/librustc_metadata/cstore.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_metadata/creader.rs b/src/librustc_metadata/creader.rs index 6d5bd5d3a09..5424ef429ad 100644 --- a/src/librustc_metadata/creader.rs +++ b/src/librustc_metadata/creader.rs @@ -141,7 +141,7 @@ impl<'a> CrateLoader<'a> { let prev_kind = source.dylib.as_ref().or(source.rlib.as_ref()) .or(source.rmeta.as_ref()) .expect("No sources for crate").1; - if ret.is_none() && (prev_kind == kind || prev_kind == PathKind::All) { + if kind.matches(prev_kind) { ret = Some(cnum); } }); diff --git a/src/librustc_metadata/cstore.rs b/src/librustc_metadata/cstore.rs index d19f05619d9..e2d3da6237a 100644 --- a/src/librustc_metadata/cstore.rs +++ b/src/librustc_metadata/cstore.rs @@ -90,8 +90,8 @@ crate struct CrateMetadata { #[derive(Clone)] pub struct CStore { metas: IndexVec<CrateNum, Option<Lrc<CrateMetadata>>>, - pub(crate) injected_panic_runtime: Option<CrateNum>, - pub(crate) allocator_kind: Option<AllocatorKind>, + crate injected_panic_runtime: Option<CrateNum>, + crate allocator_kind: Option<AllocatorKind>, } pub enum LoadedMacro { |