diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2018-07-26 11:13:11 -0600 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2018-08-04 06:53:15 -0600 |
| commit | 2a9344206be8ecd1cd2106bd93cccf46892fc2e5 (patch) | |
| tree | c7f24f8ff8b1bbdf361f42b7a1697181a5efcea8 /src/librustc_metadata/encoder.rs | |
| parent | e59e02ef46c360eb6a2e2e30dd7cd10fc71e5e41 (diff) | |
| download | rust-2a9344206be8ecd1cd2106bd93cccf46892fc2e5.tar.gz rust-2a9344206be8ecd1cd2106bd93cccf46892fc2e5.zip | |
Normalize variants of CrateType to standard style
This is a clippy-breaking change.
Diffstat (limited to 'src/librustc_metadata/encoder.rs')
| -rw-r--r-- | src/librustc_metadata/encoder.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_metadata/encoder.rs b/src/librustc_metadata/encoder.rs index 7ed991e0de3..4a02a278bc1 100644 --- a/src/librustc_metadata/encoder.rs +++ b/src/librustc_metadata/encoder.rs @@ -28,7 +28,7 @@ use rustc::traits::specialization_graph; use rustc::ty::{self, Ty, TyCtxt, ReprOptions, SymbolName}; use rustc::ty::codec::{self as ty_codec, TyEncoder}; -use rustc::session::config::{self, CrateTypeProcMacro}; +use rustc::session::config::{self, CrateType}; use rustc::util::nodemap::FxHashMap; use rustc_data_structures::stable_hasher::StableHasher; @@ -478,7 +478,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> { let attrs = tcx.hir.krate_attrs(); let link_meta = self.link_meta; - let is_proc_macro = tcx.sess.crate_types.borrow().contains(&CrateTypeProcMacro); + let is_proc_macro = tcx.sess.crate_types.borrow().contains(&CrateType::ProcMacro); let has_default_lib_allocator = attr::contains_name(&attrs, "default_lib_allocator"); let has_global_allocator = *tcx.sess.has_global_allocator.get(); @@ -1542,7 +1542,7 @@ impl<'a, 'b: 'a, 'tcx: 'b> IsolatedEncoder<'a, 'b, 'tcx> { } fn encode_dylib_dependency_formats(&mut self, _: ()) -> LazySeq<Option<LinkagePreference>> { - match self.tcx.sess.dependency_formats.borrow().get(&config::CrateTypeDylib) { + match self.tcx.sess.dependency_formats.borrow().get(&config::CrateType::Dylib) { Some(arr) => { self.lazy_seq(arr.iter().map(|slot| { match *slot { |
