nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-02 15:32:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

rustc: Make entire crates privileged scopes for the purposes of coherence

Browse Source
This commit is contained in:
Patrick Walton 2012-08-31 15:10:44 -07:00
parent 3b554c1e0c
commit 5b4d5cee03
2 changed files with 9 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/rustc/middle/typeck/coherence.rs
View File

@ -147,18 +147,12 @@ struct CoherenceChecker {
let privileged_implementations: hashmap<node_id,()>; let privileged_implementations: hashmap<node_id,()>;
// The set of types that we are currently in the privileged scope of. This
// is used while we traverse the AST while checking privileged scopes.
let privileged_types: hashmap<def_id,()>;
new(crate_context: @crate_ctxt) { new(crate_context: @crate_ctxt) {
self.crate_context = crate_context; self.crate_context = crate_context;
self.inference_context = new_infer_ctxt(crate_context.tcx); self.inference_context = new_infer_ctxt(crate_context.tcx);
self.base_type_def_ids = new_def_hash(); self.base_type_def_ids = new_def_hash();
self.privileged_implementations = int_hash(); self.privileged_implementations = int_hash();
self.privileged_types = new_def_hash();
} }
// Create a mapping containing a MethodInfo for every provided // Create a mapping containing a MethodInfo for every provided
@ -427,36 +421,12 @@ struct CoherenceChecker {
// Privileged scope checking // Privileged scope checking
fn check_privileged_scopes(crate: @crate) { fn check_privileged_scopes(crate: @crate) {
// Gather up all privileged types.
let privileged_types =
self.gather_privileged_types(crate.node.module.items);
for privileged_types.each |privileged_type| {
self.privileged_types.insert(privileged_type, ());
}
visit_crate(*crate, (), mk_vt(@{ visit_crate(*crate, (), mk_vt(@{
visit_item: |item, _context, visitor| { visit_item: |item, _context, visitor| {
match item.node { match item.node {
item_mod(module_) => { item_mod(module_) => {
// First, gather up all privileged types.
let privileged_types =
self.gather_privileged_types(module_.items);
for privileged_types.each |privileged_type| {
debug!("(checking privileged scopes) entering \
privileged scope of %d:%d",
privileged_type.crate,
privileged_type.node);
self.privileged_types.insert(privileged_type, ());
}
// Then visit the module items. // Then visit the module items.
visit_mod(module_, item.span, item.id, (), visitor); visit_mod(module_, item.span, item.id, (), visitor);
// Finally, remove privileged types from the map.
for privileged_types.each |privileged_type| {
self.privileged_types.remove(privileged_type);
}
} }
item_impl(_, associated_traits, _, _) => { item_impl(_, associated_traits, _, _) => {
match self.base_type_def_ids.find( match self.base_type_def_ids.find(
@ -467,12 +437,9 @@ struct CoherenceChecker {
} }
Some(base_type_def_id) => { Some(base_type_def_id) => {
// Check to see whether the implementation is // Check to see whether the implementation is
// in the scope of its base type. // in the same crate as its base type.
let privileged_types = &self.privileged_types;
if privileged_types.
contains_key(base_type_def_id) {
if base_type_def_id.crate == local_crate {
// Record that this implementation is OK. // Record that this implementation is OK.
self.privileged_implementations.insert self.privileged_implementations.insert
(item.id, ()); (item.id, ());
@ -492,7 +459,7 @@ struct CoherenceChecker {
~"cannot implement \ ~"cannot implement \
inherent methods \ inherent methods \
for a type outside \ for a type outside \
the scope the type \ the crate the type \
was defined in; \ was defined in; \
define and \ define and \
implement a trait \ implement a trait \
@ -546,25 +513,6 @@ struct CoherenceChecker {
return trait_id; return trait_id;
} }
fn gather_privileged_types(items: ~[@item]) -> @DVec<def_id> {
let results = @DVec();
for items.each |item| {
match item.node {
item_class(*) | item_enum(*) | item_trait(*) => {
results.push(local_def(item.id));
}
item_const(*) | item_fn(*) | item_mod(*) |
item_foreign_mod(*) | item_ty(*) | item_impl(*) |
item_mac(*) => {
// Nothing to do.
}
}
}
return results;
}
// Converts an implementation in the AST to an Impl structure. // Converts an implementation in the AST to an Impl structure.
fn create_impl_from_item(item: @item) -> @Impl { fn create_impl_from_item(item: @item) -> @Impl {

6
src/test/run-pass/coherence-impl-in-fn.rs Normal file
View File

@ -0,0 +1,6 @@
fn main() {
enum x { foo }
impl x : core::cmp::Eq {
pure fn eq(&&other: x) -> bool { self as int == other as int }
}
}