Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustc_metadata: Privatize more things #66496

Merged
merged 10 commits into from
Nov 20, 2019
Merged

rustc_metadata: Privatize more things #66496

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
68985c7
rustc_metadata: Move some structs from `cstore` to `decoder`
petrochenkov Nov 17, 2019
c6bcf60
rustc_metadata: `locator::Context` -> `CrateLocator`
petrochenkov Nov 17, 2019
bdce69d
rustc_metadata: Give a constructor to `CrateLocator`
petrochenkov Nov 17, 2019
ff3e06f
rustc_metadata: Give a constructor to `CrateMetadata`
petrochenkov Nov 17, 2019
0aed810
rustc_metadata: Minor cleanup
petrochenkov Nov 17, 2019
41ee980
rustc_metadata: Give a constructor to `CratePaths`
petrochenkov Nov 17, 2019
c157023
rustc_metadata: Move `CrateMetadata` into `decoder.rs`
petrochenkov Nov 17, 2019
09c1c94
rustc_metadata: Stop leaking `Lazy` from the `rmeta` module
petrochenkov Nov 17, 2019
26f113e
rustc_metadata: Remove `CrateMetadata::is_proc_macro_crate`
petrochenkov Nov 17, 2019
febde53
rustc_metadata: Cleanup crate search with exact paths
petrochenkov Nov 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rustc_metadata: Remove CrateMetadata::is_proc_macro_crate
  • Loading branch information
@petrochenkov
petrochenkov committed Nov 17, 2019
commit 26f113e5b670a37678750b81d8ad3e5ca2a789a0
18 changes: 7 additions & 11 deletions src/librustc_metadata/rmeta/decoder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,10 +607,6 @@ impl<'a, 'tcx> CrateMetadata {
}
}

fn is_proc_macro_crate(&self) -> bool {
self.root.is_proc_macro_crate()
}

fn is_proc_macro(&self, id: DefIndex) -> bool {
self.root.proc_macro_data.and_then(|data| data.decode(self).find(|x| *x == id)).is_some()
}
Expand Down Expand Up @@ -895,7 +891,7 @@ impl<'a, 'tcx> CrateMetadata {

/// Iterates over the language items in the given crate.
fn get_lang_items(&self, tcx: TyCtxt<'tcx>) -> &'tcx [(DefId, usize)] {
if self.is_proc_macro_crate() {
if self.root.is_proc_macro_crate() {
// Proc macro crates do not export any lang-items to the target.
&[]
} else {
Expand All @@ -911,7 +907,7 @@ impl<'a, 'tcx> CrateMetadata {
&self,
tcx: TyCtxt<'tcx>,
) -> &'tcx FxHashMap<Symbol, DefId> {
tcx.arena.alloc(if self.is_proc_macro_crate() {
tcx.arena.alloc(if self.root.is_proc_macro_crate() {
// Proc macro crates do not export any diagnostic-items to the target.
Default::default()
} else {
Expand Down Expand Up @@ -1219,7 +1215,7 @@ impl<'a, 'tcx> CrateMetadata {
tcx: TyCtxt<'tcx>,
filter: Option<DefId>,
) -> &'tcx [DefId] {
if self.is_proc_macro_crate() {
if self.root.is_proc_macro_crate() {
// proc-macro crates export no trait impls.
return &[]
}
Expand Down Expand Up @@ -1263,7 +1259,7 @@ impl<'a, 'tcx> CrateMetadata {


fn get_native_libraries(&self, sess: &Session) -> Vec<NativeLibrary> {
if self.is_proc_macro_crate() {
if self.root.is_proc_macro_crate() {
// Proc macro crates do not have any *target* native libraries.
vec![]
} else {
Expand All @@ -1272,7 +1268,7 @@ impl<'a, 'tcx> CrateMetadata {
}

fn get_foreign_modules(&self, tcx: TyCtxt<'tcx>) -> &'tcx [ForeignModule] {
if self.is_proc_macro_crate() {
if self.root.is_proc_macro_crate() {
// Proc macro crates do not have any *target* foreign modules.
&[]
} else {
Expand All @@ -1295,7 +1291,7 @@ impl<'a, 'tcx> CrateMetadata {
}

fn get_missing_lang_items(&self, tcx: TyCtxt<'tcx>) -> &'tcx [lang_items::LangItem] {
if self.is_proc_macro_crate() {
if self.root.is_proc_macro_crate() {
// Proc macro crates do not depend on any target weak lang-items.
&[]
} else {
Expand All @@ -1319,7 +1315,7 @@ impl<'a, 'tcx> CrateMetadata {
&self,
tcx: TyCtxt<'tcx>,
) -> Vec<(ExportedSymbol<'tcx>, SymbolExportLevel)> {
if self.is_proc_macro_crate() {
if self.root.is_proc_macro_crate() {
// If this crate is a custom derive crate, then we're not even going to
// link those in so we skip those crates.
vec![]
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_metadata/rmeta/decoder/cstore_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ impl cstore::CStore {
let _prof_timer = sess.prof.generic_activity("metadata_load_macro");

let data = self.get_crate_data(id.krate);
if data.is_proc_macro_crate() {
if data.root.is_proc_macro_crate() {
return LoadedMacro::ProcMacro(data.load_proc_macro(id.index, sess));
}

Expand Down