2014-01-25 01:37:51 -06:00
|
|
|
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
|
2012-12-03 18:48:01 -06:00
|
|
|
// file at the top-level directory of this distribution and at
|
|
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
|
|
// option. This file may not be copied, modified, or distributed
|
|
|
|
// except according to those terms.
|
|
|
|
|
2014-12-18 16:46:26 -06:00
|
|
|
#![crate_name = "rustc_resolve"]
|
2015-01-22 20:22:03 -06:00
|
|
|
#![unstable(feature = "rustc_private")]
|
Preliminary feature staging
This partially implements the feature staging described in the
[release channel RFC][rc]. It does not yet fully conform to the RFC as
written, but does accomplish its goals sufficiently for the 1.0 alpha
release.
It has three primary user-visible effects:
* On the nightly channel, use of unstable APIs generates a warning.
* On the beta channel, use of unstable APIs generates a warning.
* On the beta channel, use of feature gates generates a warning.
Code that does not trigger these warnings is considered 'stable',
modulo pre-1.0 bugs.
Disabling the warnings for unstable APIs continues to be done in the
existing (i.e. old) style, via `#[allow(...)]`, not that specified in
the RFC. I deem this marginally acceptable since any code that must do
this is not using the stable dialect of Rust.
Use of feature gates is itself gated with the new 'unstable_features'
lint, on nightly set to 'allow', and on beta 'warn'.
The attribute scheme used here corresponds to an older version of the
RFC, with the `#[staged_api]` crate attribute toggling the staging
behavior of the stability attributes, but the user impact is only
in-tree so I'm not concerned about having to make design changes later
(and I may ultimately prefer the scheme here after all, with the
`#[staged_api]` crate attribute).
Since the Rust codebase itself makes use of unstable features the
compiler and build system to a midly elaborate dance to allow it to
bootstrap while disobeying these lints (which would otherwise be
errors because Rust builds with `-D warnings`).
This patch includes one significant hack that causes a
regression. Because the `format_args!` macro emits calls to unstable
APIs it would trigger the lint. I added a hack to the lint to make it
not trigger, but this in turn causes arguments to `println!` not to be
checked for feature gates. I don't presently understand macro
expansion well enough to fix. This is bug #20661.
Closes #16678
[rc]: https://github.com/rust-lang/rfcs/blob/master/text/0507-release-channels.md
2015-01-06 08:26:08 -06:00
|
|
|
#![staged_api]
|
2014-12-18 16:46:26 -06:00
|
|
|
#![crate_type = "dylib"]
|
|
|
|
#![crate_type = "rlib"]
|
|
|
|
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
|
|
|
|
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
|
|
|
|
html_root_url = "http://doc.rust-lang.org/nightly/")]
|
|
|
|
|
2015-01-22 20:22:03 -06:00
|
|
|
#![feature(alloc)]
|
|
|
|
#![feature(collections)]
|
|
|
|
#![feature(core)]
|
2015-01-30 14:26:44 -06:00
|
|
|
#![feature(int_uint)]
|
|
|
|
#![feature(rustc_diagnostic_macros)]
|
2015-01-22 20:22:03 -06:00
|
|
|
#![feature(rustc_private)]
|
2015-01-30 14:26:44 -06:00
|
|
|
#![feature(staged_api)]
|
2015-01-22 20:22:03 -06:00
|
|
|
#![feature(std_misc)]
|
2014-12-18 16:46:26 -06:00
|
|
|
|
2015-01-06 11:24:46 -06:00
|
|
|
#[macro_use] extern crate log;
|
|
|
|
#[macro_use] extern crate syntax;
|
2015-01-16 14:20:03 -06:00
|
|
|
#[macro_use] #[no_link] extern crate rustc_bitflags;
|
2014-12-18 16:46:26 -06:00
|
|
|
|
|
|
|
extern crate rustc;
|
|
|
|
|
2014-11-06 02:05:53 -06:00
|
|
|
use self::PatternBindingMode::*;
|
|
|
|
use self::Namespace::*;
|
|
|
|
use self::NamespaceResult::*;
|
|
|
|
use self::NameDefinition::*;
|
|
|
|
use self::ImportDirectiveSubclass::*;
|
|
|
|
use self::ResolveResult::*;
|
|
|
|
use self::FallbackSuggestion::*;
|
|
|
|
use self::TypeParameters::*;
|
|
|
|
use self::RibKind::*;
|
|
|
|
use self::UseLexicalScopeFlag::*;
|
|
|
|
use self::ModulePrefixResult::*;
|
|
|
|
use self::NameSearchType::*;
|
|
|
|
use self::BareIdentifierPatternResolution::*;
|
|
|
|
use self::ParentLink::*;
|
|
|
|
use self::ModuleKind::*;
|
|
|
|
use self::FallbackChecks::*;
|
|
|
|
|
2014-12-18 16:46:26 -06:00
|
|
|
use rustc::session::Session;
|
|
|
|
use rustc::lint;
|
|
|
|
use rustc::metadata::csearch;
|
|
|
|
use rustc::metadata::decoder::{DefLike, DlDef, DlField, DlImpl};
|
|
|
|
use rustc::middle::def::*;
|
|
|
|
use rustc::middle::lang_items::LanguageItems;
|
|
|
|
use rustc::middle::pat_util::pat_bindings;
|
|
|
|
use rustc::middle::privacy::*;
|
|
|
|
use rustc::middle::subst::{ParamSpace, FnSpace, TypeSpace};
|
2015-01-24 14:54:52 -06:00
|
|
|
use rustc::middle::ty::{Freevar, FreevarMap, TraitMap, GlobMap};
|
2014-12-18 16:46:26 -06:00
|
|
|
use rustc::util::nodemap::{NodeMap, NodeSet, DefIdSet, FnvHashMap};
|
std: Stabilize the std::str module
This commit starts out by consolidating all `str` extension traits into one
`StrExt` trait to be included in the prelude. This means that
`UnicodeStrPrelude`, `StrPrelude`, and `StrAllocating` have all been merged into
one `StrExt` exported by the standard library. Some functionality is currently
duplicated with the `StrExt` present in libcore.
This commit also currently avoids any methods which require any form of pattern
to operate. These functions will be stabilized via a separate RFC.
Next, stability of methods and structures are as follows:
Stable
* from_utf8_unchecked
* CowString - after moving to std::string
* StrExt::as_bytes
* StrExt::as_ptr
* StrExt::bytes/Bytes - also made a struct instead of a typedef
* StrExt::char_indices/CharIndices - CharOffsets was renamed
* StrExt::chars/Chars
* StrExt::is_empty
* StrExt::len
* StrExt::lines/Lines
* StrExt::lines_any/LinesAny
* StrExt::slice_unchecked
* StrExt::trim
* StrExt::trim_left
* StrExt::trim_right
* StrExt::words/Words - also made a struct instead of a typedef
Unstable
* from_utf8 - the error type was changed to a `Result`, but the error type has
yet to prove itself
* from_c_str - this function will be handled by the c_str RFC
* FromStr - this trait will have an associated error type eventually
* StrExt::escape_default - needs iterators at least, unsure if it should make
the cut
* StrExt::escape_unicode - needs iterators at least, unsure if it should make
the cut
* StrExt::slice_chars - this function has yet to prove itself
* StrExt::slice_shift_char - awaiting conventions about slicing and shifting
* StrExt::graphemes/Graphemes - this functionality may only be in libunicode
* StrExt::grapheme_indices/GraphemeIndices - this functionality may only be in
libunicode
* StrExt::width - this functionality may only be in libunicode
* StrExt::utf16_units - this functionality may only be in libunicode
* StrExt::nfd_chars - this functionality may only be in libunicode
* StrExt::nfkd_chars - this functionality may only be in libunicode
* StrExt::nfc_chars - this functionality may only be in libunicode
* StrExt::nfkc_chars - this functionality may only be in libunicode
* StrExt::is_char_boundary - naming is uncertain with container conventions
* StrExt::char_range_at - naming is uncertain with container conventions
* StrExt::char_range_at_reverse - naming is uncertain with container conventions
* StrExt::char_at - naming is uncertain with container conventions
* StrExt::char_at_reverse - naming is uncertain with container conventions
* StrVector::concat - this functionality may be replaced with iterators, but
it's not certain at this time
* StrVector::connect - as with concat, may be deprecated in favor of iterators
Deprecated
* StrAllocating and UnicodeStrPrelude have been merged into StrExit
* eq_slice - compiler implementation detail
* from_str - use the inherent parse() method
* is_utf8 - call from_utf8 instead
* replace - call the method instead
* truncate_utf16_at_nul - this is an implementation detail of windows and does
not need to be exposed.
* utf8_char_width - moved to libunicode
* utf16_items - moved to libunicode
* is_utf16 - moved to libunicode
* Utf16Items - moved to libunicode
* Utf16Item - moved to libunicode
* Utf16Encoder - moved to libunicode
* AnyLines - renamed to LinesAny and made a struct
* SendStr - use CowString<'static> instead
* str::raw - all functionality is deprecated
* StrExt::into_string - call to_string() instead
* StrExt::repeat - use iterators instead
* StrExt::char_len - use .chars().count() instead
* StrExt::is_alphanumeric - use .chars().all(..)
* StrExt::is_whitespace - use .chars().all(..)
Pending deprecation -- while slicing syntax is being worked out, these methods
are all #[unstable]
* Str - while currently used for generic programming, this trait will be
replaced with one of [], deref coercions, or a generic conversion trait.
* StrExt::slice - use slicing syntax instead
* StrExt::slice_to - use slicing syntax instead
* StrExt::slice_from - use slicing syntax instead
* StrExt::lev_distance - deprecated with no replacement
Awaiting stabilization due to patterns and/or matching
* StrExt::contains
* StrExt::contains_char
* StrExt::split
* StrExt::splitn
* StrExt::split_terminator
* StrExt::rsplitn
* StrExt::match_indices
* StrExt::split_str
* StrExt::starts_with
* StrExt::ends_with
* StrExt::trim_chars
* StrExt::trim_left_chars
* StrExt::trim_right_chars
* StrExt::find
* StrExt::rfind
* StrExt::find_str
* StrExt::subslice_offset
2014-12-10 11:02:31 -06:00
|
|
|
use rustc::util::lev_distance::lev_distance;
|
2012-12-23 16:41:37 -06:00
|
|
|
|
2014-09-11 12:14:43 -05:00
|
|
|
use syntax::ast::{Arm, BindByRef, BindByValue, BindingMode, Block, Crate, CrateNum};
|
2014-12-30 12:19:24 -06:00
|
|
|
use syntax::ast::{DefId, Expr, ExprAgain, ExprBreak, ExprField};
|
2015-02-05 01:19:07 -06:00
|
|
|
use syntax::ast::{ExprLoop, ExprWhile, ExprMethodCall};
|
2015-02-17 11:29:13 -06:00
|
|
|
use syntax::ast::{ExprPath, ExprStruct, FnDecl};
|
2014-12-30 12:19:24 -06:00
|
|
|
use syntax::ast::{ForeignItemFn, ForeignItemStatic, Generics};
|
2014-12-23 13:34:36 -06:00
|
|
|
use syntax::ast::{Ident, ImplItem, Item, ItemConst, ItemEnum, ItemExternCrate};
|
2015-02-07 07:24:34 -06:00
|
|
|
use syntax::ast::{ItemFn, ItemForeignMod, ItemImpl, ItemMac, ItemMod, ItemStatic, ItemDefaultImpl};
|
2014-12-23 13:34:36 -06:00
|
|
|
use syntax::ast::{ItemStruct, ItemTrait, ItemTy, ItemUse};
|
2015-02-05 01:19:07 -06:00
|
|
|
use syntax::ast::{Local, MethodImplItem, Name, NodeId};
|
2014-09-07 12:09:06 -05:00
|
|
|
use syntax::ast::{Pat, PatEnum, PatIdent, PatLit};
|
2015-02-05 01:19:07 -06:00
|
|
|
use syntax::ast::{PatRange, PatStruct, Path, PrimTy};
|
|
|
|
use syntax::ast::{TraitRef, Ty, TyBool, TyChar, TyF32};
|
|
|
|
use syntax::ast::{TyF64, TyFloat, TyIs, TyI8, TyI16, TyI32, TyI64, TyInt};
|
2015-02-17 11:29:13 -06:00
|
|
|
use syntax::ast::{TyPath, TyPtr};
|
2014-12-05 20:11:46 -06:00
|
|
|
use syntax::ast::{TyRptr, TyStr, TyUs, TyU8, TyU16, TyU32, TyU64, TyUint};
|
2014-12-30 12:19:24 -06:00
|
|
|
use syntax::ast::{TypeImplItem};
|
2013-05-21 20:24:42 -05:00
|
|
|
use syntax::ast;
|
2014-11-23 03:29:41 -06:00
|
|
|
use syntax::ast_map;
|
2014-12-30 12:19:24 -06:00
|
|
|
use syntax::ast_util::{PostExpansionMethod, local_def, walk_pat};
|
2014-08-12 22:31:30 -05:00
|
|
|
use syntax::attr::AttrMetaMethods;
|
2014-02-24 14:47:19 -06:00
|
|
|
use syntax::ext::mtwt;
|
2015-01-03 21:42:21 -06:00
|
|
|
use syntax::parse::token::{self, special_names, special_idents};
|
2015-02-05 01:19:07 -06:00
|
|
|
use syntax::codemap::{self, Span, Pos};
|
2015-01-03 21:42:21 -06:00
|
|
|
use syntax::visit::{self, Visitor};
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2014-05-29 21:03:06 -05:00
|
|
|
use std::collections::{HashMap, HashSet};
|
2014-12-13 10:15:18 -06:00
|
|
|
use std::collections::hash_map::Entry::{Occupied, Vacant};
|
2013-12-20 23:14:25 -06:00
|
|
|
use std::cell::{Cell, RefCell};
|
2014-11-27 20:41:16 -06:00
|
|
|
use std::fmt;
|
2014-01-31 14:35:36 -06:00
|
|
|
use std::mem::replace;
|
2014-04-14 03:30:59 -05:00
|
|
|
use std::rc::{Rc, Weak};
|
2015-02-09 18:33:19 -06:00
|
|
|
use std::usize;
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2015-01-16 17:54:58 -06:00
|
|
|
// NB: This module needs to be declared first so diagnostics are
|
|
|
|
// registered before they are used.
|
|
|
|
pub mod diagnostics;
|
|
|
|
|
2014-12-10 21:46:38 -06:00
|
|
|
mod check_unused;
|
|
|
|
mod record_exports;
|
2014-12-30 12:16:42 -06:00
|
|
|
mod build_reduced_graph;
|
2014-12-19 01:13:54 -06:00
|
|
|
|
2015-01-03 21:54:18 -06:00
|
|
|
#[derive(Copy)]
|
2014-12-18 11:17:41 -06:00
|
|
|
struct BindingInfo {
|
2013-08-31 11:13:04 -05:00
|
|
|
span: Span,
|
2013-09-01 20:45:37 -05:00
|
|
|
binding_mode: BindingMode,
|
2012-08-06 09:20:23 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// Map from the name in a pattern to its binding mode.
|
2014-12-18 11:17:41 -06:00
|
|
|
type BindingMap = HashMap<Name, BindingInfo>;
|
2012-08-06 09:20:23 -05:00
|
|
|
|
2015-01-03 21:54:18 -06:00
|
|
|
#[derive(Copy, PartialEq)]
|
2013-10-02 07:33:01 -05:00
|
|
|
enum PatternBindingMode {
|
2012-05-22 12:54:12 -05:00
|
|
|
RefutableMode,
|
2012-11-06 20:41:06 -06:00
|
|
|
LocalIrrefutableMode,
|
2013-04-24 03:29:46 -05:00
|
|
|
ArgumentIrrefutableMode,
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2015-01-28 07:34:18 -06:00
|
|
|
#[derive(Copy, PartialEq, Eq, Hash, Debug)]
|
2013-10-02 07:33:01 -05:00
|
|
|
enum Namespace {
|
2012-05-22 12:54:12 -05:00
|
|
|
TypeNS,
|
2012-08-17 19:09:53 -05:00
|
|
|
ValueNS
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2012-11-29 16:43:33 -06:00
|
|
|
/// A NamespaceResult represents the result of resolving an import in
|
|
|
|
/// a particular namespace. The result is either definitely-resolved,
|
|
|
|
/// definitely- unresolved, or unknown.
|
2015-01-03 21:54:18 -06:00
|
|
|
#[derive(Clone)]
|
2013-10-02 07:33:01 -05:00
|
|
|
enum NamespaceResult {
|
2012-11-29 14:08:40 -06:00
|
|
|
/// Means that resolve hasn't gathered enough information yet to determine
|
|
|
|
/// whether the name is bound in this namespace. (That is, it hasn't
|
|
|
|
/// resolved all `use` directives yet.)
|
2012-05-22 12:54:12 -05:00
|
|
|
UnknownResult,
|
2012-11-29 16:43:33 -06:00
|
|
|
/// Means that resolve has determined that the name is definitely
|
|
|
|
/// not bound in the namespace.
|
2012-05-22 12:54:12 -05:00
|
|
|
UnboundResult,
|
2012-11-29 14:08:40 -06:00
|
|
|
/// Means that resolve has determined that the name is bound in the Module
|
|
|
|
/// argument, and specified by the NameBindings argument.
|
2014-04-14 03:30:59 -05:00
|
|
|
BoundResult(Rc<Module>, Rc<NameBindings>)
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2013-05-31 17:17:22 -05:00
|
|
|
impl NamespaceResult {
|
2013-10-02 07:33:01 -05:00
|
|
|
fn is_unknown(&self) -> bool {
|
2013-02-22 00:41:37 -06:00
|
|
|
match *self {
|
2012-08-27 18:26:35 -05:00
|
|
|
UnknownResult => true,
|
|
|
|
_ => false
|
|
|
|
}
|
|
|
|
}
|
2014-04-08 17:03:29 -05:00
|
|
|
fn is_unbound(&self) -> bool {
|
|
|
|
match *self {
|
|
|
|
UnboundResult => true,
|
|
|
|
_ => false
|
|
|
|
}
|
|
|
|
}
|
2012-08-27 18:26:35 -05:00
|
|
|
}
|
|
|
|
|
2013-10-02 07:33:01 -05:00
|
|
|
enum NameDefinition {
|
2012-05-22 12:54:12 -05:00
|
|
|
NoNameDefinition, //< The name was unbound.
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
ChildNameDefinition(Def, LastPrivate), //< The name identifies an immediate child.
|
|
|
|
ImportNameDefinition(Def, LastPrivate) //< The name identifies an import.
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2014-11-23 03:29:41 -06:00
|
|
|
impl<'a, 'v, 'tcx> Visitor<'v> for Resolver<'a, 'tcx> {
|
2014-09-12 05:10:30 -05:00
|
|
|
fn visit_item(&mut self, item: &Item) {
|
2013-09-26 21:10:16 -05:00
|
|
|
self.resolve_item(item);
|
2013-08-13 11:52:41 -05:00
|
|
|
}
|
2014-09-12 05:10:30 -05:00
|
|
|
fn visit_arm(&mut self, arm: &Arm) {
|
2013-09-26 21:10:16 -05:00
|
|
|
self.resolve_arm(arm);
|
2013-08-13 11:52:41 -05:00
|
|
|
}
|
2014-09-12 05:10:30 -05:00
|
|
|
fn visit_block(&mut self, block: &Block) {
|
2013-09-26 21:10:16 -05:00
|
|
|
self.resolve_block(block);
|
2013-08-13 11:52:41 -05:00
|
|
|
}
|
2014-09-12 05:10:30 -05:00
|
|
|
fn visit_expr(&mut self, expr: &Expr) {
|
2013-09-26 21:10:16 -05:00
|
|
|
self.resolve_expr(expr);
|
2013-08-13 11:52:41 -05:00
|
|
|
}
|
2014-09-12 05:10:30 -05:00
|
|
|
fn visit_local(&mut self, local: &Local) {
|
2013-09-26 21:10:16 -05:00
|
|
|
self.resolve_local(local);
|
2013-08-13 11:52:41 -05:00
|
|
|
}
|
2014-09-12 05:10:30 -05:00
|
|
|
fn visit_ty(&mut self, ty: &Ty) {
|
2013-09-26 21:10:16 -05:00
|
|
|
self.resolve_type(ty);
|
2013-08-13 11:52:41 -05:00
|
|
|
}
|
2015-02-05 01:19:07 -06:00
|
|
|
fn visit_generics(&mut self, generics: &Generics) {
|
|
|
|
self.resolve_generics(generics);
|
|
|
|
}
|
|
|
|
fn visit_poly_trait_ref(&mut self,
|
|
|
|
tref: &ast::PolyTraitRef,
|
|
|
|
m: &ast::TraitBoundModifier) {
|
|
|
|
match self.resolve_trait_reference(tref.trait_ref.ref_id, &tref.trait_ref.path, 0) {
|
|
|
|
Ok(def) => self.record_def(tref.trait_ref.ref_id, def),
|
|
|
|
Err(_) => { /* error already reported */ }
|
|
|
|
}
|
|
|
|
visit::walk_poly_trait_ref(self, tref, m);
|
|
|
|
}
|
|
|
|
fn visit_variant(&mut self, variant: &ast::Variant, generics: &Generics) {
|
|
|
|
if let Some(ref dis_expr) = variant.node.disr_expr {
|
|
|
|
// resolve the discriminator expr as a constant
|
|
|
|
self.with_constant_rib(|this| {
|
|
|
|
this.visit_expr(&**dis_expr);
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
// `visit::walk_variant` without the discriminant expression.
|
|
|
|
match variant.node.kind {
|
|
|
|
ast::TupleVariantKind(ref variant_arguments) => {
|
|
|
|
for variant_argument in variant_arguments.iter() {
|
|
|
|
self.visit_ty(&*variant_argument.ty);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ast::StructVariantKind(ref struct_definition) => {
|
|
|
|
self.visit_struct_def(&**struct_definition,
|
|
|
|
variant.node.name,
|
|
|
|
generics,
|
|
|
|
variant.node.id);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fn visit_foreign_item(&mut self, foreign_item: &ast::ForeignItem) {
|
|
|
|
let type_parameters = match foreign_item.node {
|
|
|
|
ForeignItemFn(_, ref generics) => {
|
|
|
|
HasTypeParameters(generics, FnSpace, ItemRibKind)
|
|
|
|
}
|
|
|
|
ForeignItemStatic(..) => NoTypeParameters
|
|
|
|
};
|
|
|
|
self.with_type_parameter_rib(type_parameters, |this| {
|
|
|
|
visit::walk_foreign_item(this, foreign_item);
|
|
|
|
});
|
|
|
|
}
|
|
|
|
fn visit_fn(&mut self,
|
|
|
|
function_kind: visit::FnKind<'v>,
|
|
|
|
declaration: &'v FnDecl,
|
|
|
|
block: &'v Block,
|
|
|
|
_: Span,
|
|
|
|
node_id: NodeId) {
|
|
|
|
let rib_kind = match function_kind {
|
|
|
|
visit::FkItemFn(_, generics, _, _) => {
|
|
|
|
self.visit_generics(generics);
|
|
|
|
ItemRibKind
|
|
|
|
}
|
|
|
|
visit::FkMethod(_, generics, method) => {
|
|
|
|
self.visit_generics(generics);
|
|
|
|
self.visit_explicit_self(method.pe_explicit_self());
|
|
|
|
MethodRibKind
|
|
|
|
}
|
|
|
|
visit::FkFnBlock(..) => ClosureRibKind(node_id)
|
|
|
|
};
|
|
|
|
self.resolve_function(rib_kind, declaration, block);
|
|
|
|
}
|
2013-08-13 11:52:41 -05:00
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2012-07-04 16:53:12 -05:00
|
|
|
/// Contains data for specific types of import directives.
|
2015-01-28 07:34:18 -06:00
|
|
|
#[derive(Copy,Debug)]
|
2013-10-02 07:33:01 -05:00
|
|
|
enum ImportDirectiveSubclass {
|
2014-09-30 19:11:34 -05:00
|
|
|
SingleImport(Name /* target */, Name /* source */),
|
2012-05-22 12:54:12 -05:00
|
|
|
GlobImport
|
|
|
|
}
|
|
|
|
|
2014-06-05 16:37:52 -05:00
|
|
|
type ErrorMessage = Option<(Span, String)>;
|
|
|
|
|
2013-10-02 07:33:01 -05:00
|
|
|
enum ResolveResult<T> {
|
2014-06-05 16:37:52 -05:00
|
|
|
Failed(ErrorMessage), // Failed to resolve the name, optional helpful error message.
|
|
|
|
Indeterminate, // Couldn't determine due to unresolved globs.
|
|
|
|
Success(T) // Successfully resolved the import.
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2013-05-31 17:17:22 -05:00
|
|
|
impl<T> ResolveResult<T> {
|
2013-10-02 07:33:01 -05:00
|
|
|
fn indeterminate(&self) -> bool {
|
2013-02-22 00:41:37 -06:00
|
|
|
match *self { Indeterminate => true, _ => false }
|
2012-09-07 20:53:14 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-08 16:35:09 -05:00
|
|
|
enum FallbackSuggestion {
|
|
|
|
NoSuggestion,
|
|
|
|
Field,
|
|
|
|
Method,
|
2014-08-04 15:56:56 -05:00
|
|
|
TraitItem,
|
2014-05-22 18:57:53 -05:00
|
|
|
StaticMethod(String),
|
2014-10-14 19:33:20 -05:00
|
|
|
TraitMethod(String),
|
2014-05-08 16:35:09 -05:00
|
|
|
}
|
|
|
|
|
2015-01-03 21:54:18 -06:00
|
|
|
#[derive(Copy)]
|
2013-12-10 01:16:18 -06:00
|
|
|
enum TypeParameters<'a> {
|
2014-05-31 17:53:13 -05:00
|
|
|
NoTypeParameters,
|
|
|
|
HasTypeParameters(
|
|
|
|
// Type parameters.
|
|
|
|
&'a Generics,
|
|
|
|
|
|
|
|
// Identifies the things that these parameters
|
|
|
|
// were declared on (type, fn, etc)
|
|
|
|
ParamSpace,
|
|
|
|
|
|
|
|
// The kind of the rib used for type parameters.
|
|
|
|
RibKind)
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2014-09-17 09:28:19 -05:00
|
|
|
// The rib kind controls the translation of local
|
|
|
|
// definitions (`DefLocal`) to upvars (`DefUpvar`).
|
2015-01-28 07:34:18 -06:00
|
|
|
#[derive(Copy, Debug)]
|
2013-10-02 07:33:01 -05:00
|
|
|
enum RibKind {
|
2012-05-22 12:54:12 -05:00
|
|
|
// No translation needs to be applied.
|
|
|
|
NormalRibKind,
|
2012-07-06 21:06:58 -05:00
|
|
|
|
2014-09-14 16:40:45 -05:00
|
|
|
// We passed through a closure scope at the given node ID.
|
|
|
|
// Translate upvars as appropriate.
|
2015-01-24 14:04:41 -06:00
|
|
|
ClosureRibKind(NodeId /* func id */),
|
2012-07-06 21:06:58 -05:00
|
|
|
|
2012-12-10 15:47:54 -06:00
|
|
|
// We passed through an impl or trait and are now in one of its
|
2013-06-06 02:38:41 -05:00
|
|
|
// methods. Allow references to ty params that impl or trait
|
2012-07-26 16:04:03 -05:00
|
|
|
// binds. Disallow any other upvars (including other ty params that are
|
|
|
|
// upvars).
|
2015-02-05 01:19:07 -06:00
|
|
|
MethodRibKind,
|
2012-07-26 16:04:03 -05:00
|
|
|
|
2014-05-31 00:54:04 -05:00
|
|
|
// We passed through an item scope. Disallow upvars.
|
|
|
|
ItemRibKind,
|
2012-10-15 14:27:09 -05:00
|
|
|
|
|
|
|
// We're in a constant item. Can't refer to dynamic stuff.
|
|
|
|
ConstantItemRibKind
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2015-01-03 21:54:18 -06:00
|
|
|
#[derive(Copy)]
|
2013-10-02 07:33:01 -05:00
|
|
|
enum UseLexicalScopeFlag {
|
2012-12-13 15:05:22 -06:00
|
|
|
DontUseLexicalScope,
|
|
|
|
UseLexicalScope
|
|
|
|
}
|
|
|
|
|
2013-10-02 07:33:01 -05:00
|
|
|
enum ModulePrefixResult {
|
2012-12-23 16:41:37 -06:00
|
|
|
NoPrefixFound,
|
2014-04-14 03:30:59 -05:00
|
|
|
PrefixFound(Rc<Module>, uint)
|
2012-12-13 15:05:22 -06:00
|
|
|
}
|
|
|
|
|
2015-01-03 21:54:18 -06:00
|
|
|
#[derive(Copy, PartialEq)]
|
2013-03-01 12:44:43 -06:00
|
|
|
enum NameSearchType {
|
2013-05-13 18:13:20 -05:00
|
|
|
/// We're doing a name search in order to resolve a `use` directive.
|
|
|
|
ImportSearch,
|
|
|
|
|
|
|
|
/// We're doing a name search in order to resolve a path type, a path
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
/// expression, or a path pattern.
|
|
|
|
PathSearch,
|
2013-03-01 12:44:43 -06:00
|
|
|
}
|
|
|
|
|
2015-01-03 21:54:18 -06:00
|
|
|
#[derive(Copy)]
|
2013-10-02 07:33:01 -05:00
|
|
|
enum BareIdentifierPatternResolution {
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
FoundStructOrEnumVariant(Def, LastPrivate),
|
|
|
|
FoundConst(Def, LastPrivate),
|
2012-10-30 17:53:06 -05:00
|
|
|
BareIdentifierPatternUnresolved
|
2012-07-06 21:06:58 -05:00
|
|
|
}
|
|
|
|
|
2012-08-14 21:20:56 -05:00
|
|
|
/// One local scope.
|
2015-01-28 07:34:18 -06:00
|
|
|
#[derive(Debug)]
|
2013-10-02 07:33:01 -05:00
|
|
|
struct Rib {
|
2014-09-29 18:06:13 -05:00
|
|
|
bindings: HashMap<Name, DefLike>,
|
2012-09-06 21:40:15 -05:00
|
|
|
kind: RibKind,
|
2012-09-05 17:58:43 -05:00
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2013-08-31 11:13:04 -05:00
|
|
|
impl Rib {
|
2013-10-02 07:33:01 -05:00
|
|
|
fn new(kind: RibKind) -> Rib {
|
2013-08-31 11:13:04 -05:00
|
|
|
Rib {
|
2014-09-29 18:06:13 -05:00
|
|
|
bindings: HashMap::new(),
|
2013-08-31 11:13:04 -05:00
|
|
|
kind: kind
|
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-11-23 03:29:41 -06:00
|
|
|
/// Whether an import can be shadowed by another import.
|
2015-01-28 07:34:18 -06:00
|
|
|
#[derive(Debug,PartialEq,Clone,Copy)]
|
2014-11-23 03:29:41 -06:00
|
|
|
enum Shadowable {
|
|
|
|
Always,
|
|
|
|
Never
|
|
|
|
}
|
|
|
|
|
2012-07-04 16:53:12 -05:00
|
|
|
/// One import directive.
|
2015-01-28 07:34:18 -06:00
|
|
|
#[derive(Debug)]
|
2013-10-02 07:33:01 -05:00
|
|
|
struct ImportDirective {
|
2014-09-30 19:11:34 -05:00
|
|
|
module_path: Vec<Name>,
|
2014-04-14 03:30:59 -05:00
|
|
|
subclass: ImportDirectiveSubclass,
|
2013-08-31 11:13:04 -05:00
|
|
|
span: Span,
|
2013-07-27 03:25:59 -05:00
|
|
|
id: NodeId,
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
is_public: bool, // see note in ImportResolution about how to use this
|
2014-11-23 03:29:41 -06:00
|
|
|
shadowable: Shadowable,
|
2012-09-05 17:58:43 -05:00
|
|
|
}
|
2012-07-06 21:06:58 -05:00
|
|
|
|
2013-08-31 11:13:04 -05:00
|
|
|
impl ImportDirective {
|
2014-09-30 19:11:34 -05:00
|
|
|
fn new(module_path: Vec<Name> ,
|
2014-04-14 03:30:59 -05:00
|
|
|
subclass: ImportDirectiveSubclass,
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
span: Span,
|
|
|
|
id: NodeId,
|
2014-08-12 22:31:30 -05:00
|
|
|
is_public: bool,
|
2014-11-23 03:29:41 -06:00
|
|
|
shadowable: Shadowable)
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
-> ImportDirective {
|
2013-08-31 11:13:04 -05:00
|
|
|
ImportDirective {
|
|
|
|
module_path: module_path,
|
|
|
|
subclass: subclass,
|
|
|
|
span: span,
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
id: id,
|
|
|
|
is_public: is_public,
|
2014-08-12 22:31:30 -05:00
|
|
|
shadowable: shadowable,
|
2013-08-31 11:13:04 -05:00
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-07-04 16:53:12 -05:00
|
|
|
/// The item that an import resolves to.
|
2015-01-28 07:34:18 -06:00
|
|
|
#[derive(Clone,Debug)]
|
2013-10-02 07:33:01 -05:00
|
|
|
struct Target {
|
2014-04-14 03:30:59 -05:00
|
|
|
target_module: Rc<Module>,
|
|
|
|
bindings: Rc<NameBindings>,
|
2014-11-23 03:29:41 -06:00
|
|
|
shadowable: Shadowable,
|
2012-09-05 17:58:43 -05:00
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2013-08-31 11:13:04 -05:00
|
|
|
impl Target {
|
2014-08-12 22:31:30 -05:00
|
|
|
fn new(target_module: Rc<Module>,
|
|
|
|
bindings: Rc<NameBindings>,
|
2014-11-23 03:29:41 -06:00
|
|
|
shadowable: Shadowable)
|
2014-08-12 22:31:30 -05:00
|
|
|
-> Target {
|
2013-08-31 11:13:04 -05:00
|
|
|
Target {
|
|
|
|
target_module: target_module,
|
2014-08-12 22:31:30 -05:00
|
|
|
bindings: bindings,
|
|
|
|
shadowable: shadowable,
|
2013-08-31 11:13:04 -05:00
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-11-29 14:08:40 -06:00
|
|
|
/// An ImportResolution represents a particular `use` directive.
|
2015-01-28 07:34:18 -06:00
|
|
|
#[derive(Debug)]
|
2013-10-02 07:33:01 -05:00
|
|
|
struct ImportResolution {
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
/// Whether this resolution came from a `use` or a `pub use`. Note that this
|
|
|
|
/// should *not* be used whenever resolution is being performed, this is
|
|
|
|
/// only looked at for glob imports statements currently. Privacy testing
|
|
|
|
/// occurs during a later phase of compilation.
|
2014-04-14 03:30:59 -05:00
|
|
|
is_public: bool,
|
2012-07-06 21:06:58 -05:00
|
|
|
|
2012-05-22 12:54:12 -05:00
|
|
|
// The number of outstanding references to this name. When this reaches
|
|
|
|
// zero, outside modules can count on the targets being correct. Before
|
|
|
|
// then, all bets are off; future imports could override this name.
|
2014-04-14 03:30:59 -05:00
|
|
|
outstanding_references: uint,
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2012-11-29 14:08:40 -06:00
|
|
|
/// The value that this `use` directive names, if there is one.
|
2014-04-14 03:30:59 -05:00
|
|
|
value_target: Option<Target>,
|
2013-06-09 23:39:15 -05:00
|
|
|
/// The source node of the `use` directive leading to the value target
|
|
|
|
/// being non-none
|
2014-04-14 03:30:59 -05:00
|
|
|
value_id: NodeId,
|
2013-06-09 23:39:15 -05:00
|
|
|
|
2012-11-29 14:08:40 -06:00
|
|
|
/// The type that this `use` directive names, if there is one.
|
2014-04-14 03:30:59 -05:00
|
|
|
type_target: Option<Target>,
|
2013-06-09 23:39:15 -05:00
|
|
|
/// The source node of the `use` directive leading to the type target
|
|
|
|
/// being non-none
|
2014-04-14 03:30:59 -05:00
|
|
|
type_id: NodeId,
|
2014-03-28 12:29:55 -05:00
|
|
|
}
|
|
|
|
|
2013-08-31 11:13:04 -05:00
|
|
|
impl ImportResolution {
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
fn new(id: NodeId, is_public: bool) -> ImportResolution {
|
2013-08-31 11:13:04 -05:00
|
|
|
ImportResolution {
|
2014-04-14 03:30:59 -05:00
|
|
|
type_id: id,
|
|
|
|
value_id: id,
|
|
|
|
outstanding_references: 0,
|
|
|
|
value_target: None,
|
|
|
|
type_target: None,
|
|
|
|
is_public: is_public,
|
2013-08-31 11:13:04 -05:00
|
|
|
}
|
2012-09-05 17:58:43 -05:00
|
|
|
}
|
|
|
|
|
2013-10-02 07:33:01 -05:00
|
|
|
fn target_for_namespace(&self, namespace: Namespace)
|
2013-05-31 17:17:22 -05:00
|
|
|
-> Option<Target> {
|
2012-09-07 21:04:40 -05:00
|
|
|
match namespace {
|
2014-04-14 03:30:59 -05:00
|
|
|
TypeNS => self.type_target.clone(),
|
|
|
|
ValueNS => self.value_target.clone(),
|
2012-09-07 21:04:40 -05:00
|
|
|
}
|
|
|
|
}
|
2013-06-09 23:39:15 -05:00
|
|
|
|
2013-07-27 03:25:59 -05:00
|
|
|
fn id(&self, namespace: Namespace) -> NodeId {
|
2013-06-09 23:39:15 -05:00
|
|
|
match namespace {
|
2014-04-14 03:30:59 -05:00
|
|
|
TypeNS => self.type_id,
|
|
|
|
ValueNS => self.value_id,
|
2013-06-09 23:39:15 -05:00
|
|
|
}
|
|
|
|
}
|
2014-11-23 03:29:41 -06:00
|
|
|
|
|
|
|
fn shadowable(&self, namespace: Namespace) -> Shadowable {
|
|
|
|
let target = self.target_for_namespace(namespace);
|
|
|
|
if target.is_none() {
|
|
|
|
return Shadowable::Always;
|
|
|
|
}
|
|
|
|
|
|
|
|
target.unwrap().shadowable
|
|
|
|
}
|
2014-12-28 17:31:17 -06:00
|
|
|
|
|
|
|
fn set_target_and_id(&mut self,
|
|
|
|
namespace: Namespace,
|
|
|
|
target: Option<Target>,
|
|
|
|
id: NodeId) {
|
|
|
|
match namespace {
|
|
|
|
TypeNS => {
|
|
|
|
self.type_target = target;
|
|
|
|
self.type_id = id;
|
|
|
|
}
|
|
|
|
ValueNS => {
|
|
|
|
self.value_target = target;
|
|
|
|
self.value_id = id;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-09-07 21:04:40 -05:00
|
|
|
}
|
|
|
|
|
2012-07-04 16:53:12 -05:00
|
|
|
/// The link from a module up to its nearest parent node.
|
2015-01-28 07:34:18 -06:00
|
|
|
#[derive(Clone,Debug)]
|
2013-10-02 07:33:01 -05:00
|
|
|
enum ParentLink {
|
2012-05-22 12:54:12 -05:00
|
|
|
NoParentLink,
|
2014-09-30 19:11:34 -05:00
|
|
|
ModuleParentLink(Weak<Module>, Name),
|
2014-04-14 03:30:59 -05:00
|
|
|
BlockParentLink(Weak<Module>, NodeId)
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2012-12-23 16:41:37 -06:00
|
|
|
/// The type of module this is.
|
2015-01-28 07:34:18 -06:00
|
|
|
#[derive(Copy, PartialEq, Debug)]
|
2013-10-02 07:33:01 -05:00
|
|
|
enum ModuleKind {
|
2012-12-23 16:41:37 -06:00
|
|
|
NormalModuleKind,
|
|
|
|
TraitModuleKind,
|
2014-10-19 01:46:08 -05:00
|
|
|
EnumModuleKind,
|
2015-01-16 16:25:45 -06:00
|
|
|
TypeModuleKind,
|
2012-12-23 16:41:37 -06:00
|
|
|
AnonymousModuleKind,
|
|
|
|
}
|
|
|
|
|
2012-07-04 16:53:12 -05:00
|
|
|
/// One node in the tree of modules.
|
2013-10-02 07:33:01 -05:00
|
|
|
struct Module {
|
2012-09-06 21:40:15 -05:00
|
|
|
parent_link: ParentLink,
|
2013-12-19 20:56:20 -06:00
|
|
|
def_id: Cell<Option<DefId>>,
|
2013-12-19 20:52:35 -06:00
|
|
|
kind: Cell<ModuleKind>,
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
is_public: bool,
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2014-04-14 03:30:59 -05:00
|
|
|
children: RefCell<HashMap<Name, Rc<NameBindings>>>,
|
|
|
|
imports: RefCell<Vec<ImportDirective>>,
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2013-03-26 21:53:33 -05:00
|
|
|
// The external module children of this node that were declared with
|
2014-02-14 12:10:06 -06:00
|
|
|
// `extern crate`.
|
2014-04-14 03:30:59 -05:00
|
|
|
external_module_children: RefCell<HashMap<Name, Rc<Module>>>,
|
2013-03-26 21:53:33 -05:00
|
|
|
|
2012-05-22 12:54:12 -05:00
|
|
|
// The anonymous children of this node. Anonymous children are pseudo-
|
|
|
|
// modules that are implicitly created around items contained within
|
|
|
|
// blocks.
|
|
|
|
//
|
|
|
|
// For example, if we have this:
|
|
|
|
//
|
|
|
|
// fn f() {
|
|
|
|
// fn g() {
|
|
|
|
// ...
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// There will be an anonymous module created around `g` with the ID of the
|
|
|
|
// entry block for `f`.
|
2014-04-14 03:30:59 -05:00
|
|
|
anonymous_children: RefCell<NodeMap<Rc<Module>>>,
|
2012-05-22 12:54:12 -05:00
|
|
|
|
|
|
|
// The status of resolving each import in this module.
|
2014-04-14 03:30:59 -05:00
|
|
|
import_resolutions: RefCell<HashMap<Name, ImportResolution>>,
|
2012-05-22 12:54:12 -05:00
|
|
|
|
|
|
|
// The number of unresolved globs that this module exports.
|
2013-12-19 20:59:03 -06:00
|
|
|
glob_count: Cell<uint>,
|
2012-05-22 12:54:12 -05:00
|
|
|
|
|
|
|
// The index of the import we're resolving.
|
2013-12-19 21:01:02 -06:00
|
|
|
resolved_import_count: Cell<uint>,
|
2013-08-21 20:39:30 -05:00
|
|
|
|
|
|
|
// Whether this module is populated. If not populated, any attempt to
|
|
|
|
// access the children must be preceded with a
|
|
|
|
// `populate_module_if_necessary` call.
|
2013-12-19 20:53:59 -06:00
|
|
|
populated: Cell<bool>,
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2013-08-31 11:13:04 -05:00
|
|
|
impl Module {
|
2013-10-02 07:33:01 -05:00
|
|
|
fn new(parent_link: ParentLink,
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
def_id: Option<DefId>,
|
|
|
|
kind: ModuleKind,
|
|
|
|
external: bool,
|
|
|
|
is_public: bool)
|
2013-12-19 20:52:35 -06:00
|
|
|
-> Module {
|
2013-08-31 11:13:04 -05:00
|
|
|
Module {
|
|
|
|
parent_link: parent_link,
|
2013-12-19 20:56:20 -06:00
|
|
|
def_id: Cell::new(def_id),
|
2013-12-19 20:52:35 -06:00
|
|
|
kind: Cell::new(kind),
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
is_public: is_public,
|
2013-12-21 17:32:44 -06:00
|
|
|
children: RefCell::new(HashMap::new()),
|
2014-03-04 12:02:49 -06:00
|
|
|
imports: RefCell::new(Vec::new()),
|
2013-12-21 16:05:26 -06:00
|
|
|
external_module_children: RefCell::new(HashMap::new()),
|
2015-01-16 16:27:43 -06:00
|
|
|
anonymous_children: RefCell::new(NodeMap()),
|
2013-12-21 17:15:54 -06:00
|
|
|
import_resolutions: RefCell::new(HashMap::new()),
|
2013-12-19 20:59:03 -06:00
|
|
|
glob_count: Cell::new(0),
|
2013-12-19 21:01:02 -06:00
|
|
|
resolved_import_count: Cell::new(0),
|
2013-12-19 20:53:59 -06:00
|
|
|
populated: Cell::new(!external),
|
2013-08-31 11:13:04 -05:00
|
|
|
}
|
2012-09-05 17:58:43 -05:00
|
|
|
}
|
|
|
|
|
2013-10-02 07:33:01 -05:00
|
|
|
fn all_imports_resolved(&self) -> bool {
|
2014-03-20 21:49:20 -05:00
|
|
|
self.imports.borrow().len() == self.resolved_import_count.get()
|
2012-09-07 21:04:40 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-20 17:45:07 -06:00
|
|
|
impl fmt::Debug for Module {
|
2014-11-27 20:41:16 -06:00
|
|
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
2014-12-20 02:09:35 -06:00
|
|
|
write!(f, "{:?}, kind: {:?}, {}",
|
2014-11-27 20:41:16 -06:00
|
|
|
self.def_id,
|
|
|
|
self.kind,
|
|
|
|
if self.is_public { "public" } else { "private" } )
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-10-19 01:46:08 -05:00
|
|
|
bitflags! {
|
2015-01-28 07:34:18 -06:00
|
|
|
#[derive(Debug)]
|
2014-10-19 01:46:08 -05:00
|
|
|
flags DefModifiers: u8 {
|
|
|
|
const PUBLIC = 0b0000_0001,
|
|
|
|
const IMPORTABLE = 0b0000_0010,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-10-15 16:56:42 -05:00
|
|
|
// Records a possibly-private type definition.
|
2015-01-28 07:34:18 -06:00
|
|
|
#[derive(Clone,Debug)]
|
2013-10-02 07:33:01 -05:00
|
|
|
struct TypeNsDef {
|
2014-10-19 01:46:08 -05:00
|
|
|
modifiers: DefModifiers, // see note in ImportResolution about how to use this
|
2014-04-14 03:30:59 -05:00
|
|
|
module_def: Option<Rc<Module>>,
|
2013-09-01 20:45:37 -05:00
|
|
|
type_def: Option<Def>,
|
2013-08-31 11:13:04 -05:00
|
|
|
type_span: Option<Span>
|
2012-10-15 16:56:42 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// Records a possibly-private value definition.
|
2015-01-28 07:34:18 -06:00
|
|
|
#[derive(Clone, Copy, Debug)]
|
2013-10-02 07:33:01 -05:00
|
|
|
struct ValueNsDef {
|
2014-10-19 01:46:08 -05:00
|
|
|
modifiers: DefModifiers, // see note in ImportResolution about how to use this
|
2013-09-01 20:45:37 -05:00
|
|
|
def: Def,
|
2013-08-31 11:13:04 -05:00
|
|
|
value_span: Option<Span>,
|
2012-08-17 19:55:34 -05:00
|
|
|
}
|
|
|
|
|
2012-07-06 21:06:58 -05:00
|
|
|
// Records the definitions (at most one for each namespace) that a name is
|
|
|
|
// bound to.
|
2015-01-28 07:34:18 -06:00
|
|
|
#[derive(Debug)]
|
2013-10-02 07:33:01 -05:00
|
|
|
struct NameBindings {
|
2013-12-21 16:13:06 -06:00
|
|
|
type_def: RefCell<Option<TypeNsDef>>, //< Meaning in type namespace.
|
2013-12-21 16:15:07 -06:00
|
|
|
value_def: RefCell<Option<ValueNsDef>>, //< Meaning in value namespace.
|
2012-09-07 21:04:40 -05:00
|
|
|
}
|
|
|
|
|
2013-05-31 17:17:22 -05:00
|
|
|
impl NameBindings {
|
2014-05-28 14:36:05 -05:00
|
|
|
fn new() -> NameBindings {
|
|
|
|
NameBindings {
|
|
|
|
type_def: RefCell::new(None),
|
|
|
|
value_def: RefCell::new(None),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-07-04 16:53:12 -05:00
|
|
|
/// Creates a new module in this set of name bindings.
|
2013-12-21 16:20:57 -06:00
|
|
|
fn define_module(&self,
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
parent_link: ParentLink,
|
|
|
|
def_id: Option<DefId>,
|
|
|
|
kind: ModuleKind,
|
|
|
|
external: bool,
|
|
|
|
is_public: bool,
|
|
|
|
sp: Span) {
|
2012-10-15 20:04:15 -05:00
|
|
|
// Merges the module with the existing type def or creates a new one.
|
2014-10-19 01:46:08 -05:00
|
|
|
let modifiers = if is_public { PUBLIC } else { DefModifiers::empty() } | IMPORTABLE;
|
2014-10-21 15:08:07 -05:00
|
|
|
let module_ = Rc::new(Module::new(parent_link,
|
|
|
|
def_id,
|
|
|
|
kind,
|
|
|
|
external,
|
2014-04-14 03:30:59 -05:00
|
|
|
is_public));
|
2014-03-28 12:29:55 -05:00
|
|
|
let type_def = self.type_def.borrow().clone();
|
|
|
|
match type_def {
|
2012-10-15 20:04:15 -05:00
|
|
|
None => {
|
2014-04-02 08:55:33 -05:00
|
|
|
*self.type_def.borrow_mut() = Some(TypeNsDef {
|
2014-10-19 01:46:08 -05:00
|
|
|
modifiers: modifiers,
|
2012-10-15 20:04:15 -05:00
|
|
|
module_def: Some(module_),
|
2013-05-14 23:49:30 -05:00
|
|
|
type_def: None,
|
|
|
|
type_span: Some(sp)
|
2014-04-02 08:55:33 -05:00
|
|
|
});
|
2012-10-15 20:04:15 -05:00
|
|
|
}
|
2013-05-29 18:59:33 -05:00
|
|
|
Some(type_def) => {
|
2014-04-02 08:55:33 -05:00
|
|
|
*self.type_def.borrow_mut() = Some(TypeNsDef {
|
2014-10-19 01:46:08 -05:00
|
|
|
modifiers: modifiers,
|
2012-10-15 20:04:15 -05:00
|
|
|
module_def: Some(module_),
|
2013-05-14 23:49:30 -05:00
|
|
|
type_span: Some(sp),
|
2013-05-29 18:59:33 -05:00
|
|
|
type_def: type_def.type_def
|
2014-04-02 08:55:33 -05:00
|
|
|
});
|
2012-10-15 20:04:15 -05:00
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-13 18:13:20 -05:00
|
|
|
/// Sets the kind of the module, creating a new one if necessary.
|
2013-12-21 16:20:57 -06:00
|
|
|
fn set_module_kind(&self,
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
parent_link: ParentLink,
|
|
|
|
def_id: Option<DefId>,
|
|
|
|
kind: ModuleKind,
|
|
|
|
external: bool,
|
|
|
|
is_public: bool,
|
|
|
|
_sp: Span) {
|
2014-10-19 01:46:08 -05:00
|
|
|
let modifiers = if is_public { PUBLIC } else { DefModifiers::empty() } | IMPORTABLE;
|
2014-03-28 12:29:55 -05:00
|
|
|
let type_def = self.type_def.borrow().clone();
|
|
|
|
match type_def {
|
2013-05-13 18:13:20 -05:00
|
|
|
None => {
|
2014-11-28 22:09:12 -06:00
|
|
|
let module = Module::new(parent_link,
|
|
|
|
def_id,
|
|
|
|
kind,
|
|
|
|
external,
|
|
|
|
is_public);
|
2014-04-02 08:55:33 -05:00
|
|
|
*self.type_def.borrow_mut() = Some(TypeNsDef {
|
2014-10-19 01:46:08 -05:00
|
|
|
modifiers: modifiers,
|
2014-04-14 03:30:59 -05:00
|
|
|
module_def: Some(Rc::new(module)),
|
2013-05-16 17:37:52 -05:00
|
|
|
type_def: None,
|
|
|
|
type_span: None,
|
2014-04-02 08:55:33 -05:00
|
|
|
});
|
2013-05-13 18:13:20 -05:00
|
|
|
}
|
|
|
|
Some(type_def) => {
|
|
|
|
match type_def.module_def {
|
|
|
|
None => {
|
2014-04-14 03:30:59 -05:00
|
|
|
let module = Module::new(parent_link,
|
|
|
|
def_id,
|
|
|
|
kind,
|
|
|
|
external,
|
|
|
|
is_public);
|
2014-04-02 08:55:33 -05:00
|
|
|
*self.type_def.borrow_mut() = Some(TypeNsDef {
|
2014-10-19 01:46:08 -05:00
|
|
|
modifiers: modifiers,
|
2014-04-14 03:30:59 -05:00
|
|
|
module_def: Some(Rc::new(module)),
|
2013-05-16 17:37:52 -05:00
|
|
|
type_def: type_def.type_def,
|
|
|
|
type_span: None,
|
2014-04-02 08:55:33 -05:00
|
|
|
});
|
2013-05-13 18:13:20 -05:00
|
|
|
}
|
2013-12-19 20:52:35 -06:00
|
|
|
Some(module_def) => module_def.kind.set(kind),
|
2013-05-13 18:13:20 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-07-04 16:53:12 -05:00
|
|
|
/// Records a type definition.
|
2014-10-19 01:46:08 -05:00
|
|
|
fn define_type(&self, def: Def, sp: Span, modifiers: DefModifiers) {
|
2014-12-20 02:09:35 -06:00
|
|
|
debug!("defining type for def {:?} with modifiers {:?}", def, modifiers);
|
2012-10-15 20:04:15 -05:00
|
|
|
// Merges the type with the existing type def or creates a new one.
|
2014-03-28 12:29:55 -05:00
|
|
|
let type_def = self.type_def.borrow().clone();
|
|
|
|
match type_def {
|
2012-10-15 20:04:15 -05:00
|
|
|
None => {
|
2014-04-02 08:55:33 -05:00
|
|
|
*self.type_def.borrow_mut() = Some(TypeNsDef {
|
2012-10-15 20:04:15 -05:00
|
|
|
module_def: None,
|
2013-05-14 23:49:30 -05:00
|
|
|
type_def: Some(def),
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
type_span: Some(sp),
|
2014-10-19 01:46:08 -05:00
|
|
|
modifiers: modifiers,
|
2014-04-02 08:55:33 -05:00
|
|
|
});
|
2012-10-15 20:04:15 -05:00
|
|
|
}
|
2013-05-29 18:59:33 -05:00
|
|
|
Some(type_def) => {
|
2014-04-02 08:55:33 -05:00
|
|
|
*self.type_def.borrow_mut() = Some(TypeNsDef {
|
2014-11-28 22:09:12 -06:00
|
|
|
module_def: type_def.module_def,
|
2012-10-15 20:04:15 -05:00
|
|
|
type_def: Some(def),
|
2013-05-14 23:49:30 -05:00
|
|
|
type_span: Some(sp),
|
2014-10-19 01:46:08 -05:00
|
|
|
modifiers: modifiers,
|
2014-04-02 08:55:33 -05:00
|
|
|
});
|
2012-10-15 20:04:15 -05:00
|
|
|
}
|
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2012-07-04 16:53:12 -05:00
|
|
|
/// Records a value definition.
|
2014-10-19 01:46:08 -05:00
|
|
|
fn define_value(&self, def: Def, sp: Span, modifiers: DefModifiers) {
|
2014-12-20 02:09:35 -06:00
|
|
|
debug!("defining value for def {:?} with modifiers {:?}", def, modifiers);
|
2014-04-02 08:55:33 -05:00
|
|
|
*self.value_def.borrow_mut() = Some(ValueNsDef {
|
2013-12-21 16:15:07 -06:00
|
|
|
def: def,
|
|
|
|
value_span: Some(sp),
|
2014-10-19 01:46:08 -05:00
|
|
|
modifiers: modifiers,
|
2014-04-02 08:55:33 -05:00
|
|
|
});
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2012-07-04 16:53:12 -05:00
|
|
|
/// Returns the module node if applicable.
|
2014-04-14 03:30:59 -05:00
|
|
|
fn get_module_if_available(&self) -> Option<Rc<Module>> {
|
2014-03-20 21:49:20 -05:00
|
|
|
match *self.type_def.borrow() {
|
2014-04-14 03:30:59 -05:00
|
|
|
Some(ref type_def) => type_def.module_def.clone(),
|
2012-10-15 20:04:15 -05:00
|
|
|
None => None
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-11-24 19:06:06 -06:00
|
|
|
/// Returns the module node. Panics if this node does not have a module
|
|
|
|
/// definition.
|
2014-04-14 03:30:59 -05:00
|
|
|
fn get_module(&self) -> Rc<Module> {
|
2012-10-15 20:04:15 -05:00
|
|
|
match self.get_module_if_available() {
|
|
|
|
None => {
|
2014-10-09 14:17:22 -05:00
|
|
|
panic!("get_module called on a node with no module \
|
2013-01-31 19:51:01 -06:00
|
|
|
definition!")
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2012-10-15 20:04:15 -05:00
|
|
|
Some(module_def) => module_def
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-02 07:33:01 -05:00
|
|
|
fn defined_in_namespace(&self, namespace: Namespace) -> bool {
|
2012-08-06 14:34:08 -05:00
|
|
|
match namespace {
|
2014-03-28 12:29:55 -05:00
|
|
|
TypeNS => return self.type_def.borrow().is_some(),
|
|
|
|
ValueNS => return self.value_def.borrow().is_some()
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-02 07:33:01 -05:00
|
|
|
fn defined_in_public_namespace(&self, namespace: Namespace) -> bool {
|
2014-10-19 01:46:08 -05:00
|
|
|
self.defined_in_namespace_with(namespace, PUBLIC)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn defined_in_namespace_with(&self, namespace: Namespace, modifiers: DefModifiers) -> bool {
|
2013-02-25 23:34:45 -06:00
|
|
|
match namespace {
|
2014-03-28 12:29:55 -05:00
|
|
|
TypeNS => match *self.type_def.borrow() {
|
2014-10-19 01:46:08 -05:00
|
|
|
Some(ref def) => def.modifiers.contains(modifiers), None => false
|
2013-02-25 23:34:45 -06:00
|
|
|
},
|
2014-03-28 12:29:55 -05:00
|
|
|
ValueNS => match *self.value_def.borrow() {
|
2014-10-19 01:46:08 -05:00
|
|
|
Some(ref def) => def.modifiers.contains(modifiers), None => false
|
2013-02-25 23:34:45 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-02 07:33:01 -05:00
|
|
|
fn def_for_namespace(&self, namespace: Namespace) -> Option<Def> {
|
2012-08-06 14:34:08 -05:00
|
|
|
match namespace {
|
2012-10-15 16:56:42 -05:00
|
|
|
TypeNS => {
|
2014-03-28 12:29:55 -05:00
|
|
|
match *self.type_def.borrow() {
|
2012-10-15 16:56:42 -05:00
|
|
|
None => None,
|
2014-04-14 03:30:59 -05:00
|
|
|
Some(ref type_def) => {
|
2013-12-21 16:13:06 -06:00
|
|
|
match type_def.type_def {
|
2012-10-15 20:04:15 -05:00
|
|
|
Some(type_def) => Some(type_def),
|
2013-06-18 11:39:16 -05:00
|
|
|
None => {
|
|
|
|
match type_def.module_def {
|
2014-04-14 03:30:59 -05:00
|
|
|
Some(ref module) => {
|
2013-12-19 20:56:20 -06:00
|
|
|
match module.def_id.get() {
|
2013-09-01 20:45:37 -05:00
|
|
|
Some(did) => Some(DefMod(did)),
|
2013-06-18 11:39:16 -05:00
|
|
|
None => None,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
None => None,
|
|
|
|
}
|
|
|
|
}
|
2012-10-15 20:04:15 -05:00
|
|
|
}
|
2012-08-17 19:55:34 -05:00
|
|
|
}
|
|
|
|
}
|
2012-10-15 16:56:42 -05:00
|
|
|
}
|
|
|
|
ValueNS => {
|
2014-03-28 12:29:55 -05:00
|
|
|
match *self.value_def.borrow() {
|
2012-10-15 16:56:42 -05:00
|
|
|
None => None,
|
|
|
|
Some(value_def) => Some(value_def.def)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-02 07:33:01 -05:00
|
|
|
fn span_for_namespace(&self, namespace: Namespace) -> Option<Span> {
|
2012-10-15 16:56:42 -05:00
|
|
|
if self.defined_in_namespace(namespace) {
|
2012-08-06 18:10:56 -05:00
|
|
|
match namespace {
|
2013-05-14 23:49:30 -05:00
|
|
|
TypeNS => {
|
2014-03-28 12:29:55 -05:00
|
|
|
match *self.type_def.borrow() {
|
2013-05-14 23:49:30 -05:00
|
|
|
None => None,
|
2014-04-14 03:30:59 -05:00
|
|
|
Some(ref type_def) => type_def.type_span
|
2013-05-14 23:49:30 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
ValueNS => {
|
2014-03-28 12:29:55 -05:00
|
|
|
match *self.value_def.borrow() {
|
2013-05-14 23:49:30 -05:00
|
|
|
None => None,
|
2014-04-14 03:30:59 -05:00
|
|
|
Some(ref value_def) => value_def.value_span
|
2013-05-14 23:49:30 -05:00
|
|
|
}
|
|
|
|
}
|
2012-08-06 18:10:56 -05:00
|
|
|
}
|
2012-10-15 16:56:42 -05:00
|
|
|
} else {
|
|
|
|
None
|
2012-08-06 18:10:56 -05:00
|
|
|
}
|
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2012-07-04 16:53:12 -05:00
|
|
|
/// Interns the names of the primitive types.
|
2013-10-02 07:33:01 -05:00
|
|
|
struct PrimitiveTypeTable {
|
2014-01-09 07:05:33 -06:00
|
|
|
primitive_types: HashMap<Name, PrimTy>,
|
2012-09-07 21:04:40 -05:00
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2013-05-31 17:17:22 -05:00
|
|
|
impl PrimitiveTypeTable {
|
2014-05-28 14:36:05 -05:00
|
|
|
fn new() -> PrimitiveTypeTable {
|
|
|
|
let mut table = PrimitiveTypeTable {
|
|
|
|
primitive_types: HashMap::new()
|
|
|
|
};
|
|
|
|
|
|
|
|
table.intern("bool", TyBool);
|
|
|
|
table.intern("char", TyChar);
|
|
|
|
table.intern("f32", TyFloat(TyF32));
|
|
|
|
table.intern("f64", TyFloat(TyF64));
|
2015-01-08 03:13:14 -06:00
|
|
|
table.intern("int", TyInt(TyIs(true)));
|
|
|
|
table.intern("isize", TyInt(TyIs(false)));
|
2014-05-28 14:36:05 -05:00
|
|
|
table.intern("i8", TyInt(TyI8));
|
|
|
|
table.intern("i16", TyInt(TyI16));
|
|
|
|
table.intern("i32", TyInt(TyI32));
|
|
|
|
table.intern("i64", TyInt(TyI64));
|
|
|
|
table.intern("str", TyStr);
|
2015-01-08 03:13:14 -06:00
|
|
|
table.intern("uint", TyUint(TyUs(true)));
|
|
|
|
table.intern("usize", TyUint(TyUs(false)));
|
2014-05-28 14:36:05 -05:00
|
|
|
table.intern("u8", TyUint(TyU8));
|
|
|
|
table.intern("u16", TyUint(TyU16));
|
|
|
|
table.intern("u32", TyUint(TyU32));
|
|
|
|
table.intern("u64", TyUint(TyU64));
|
|
|
|
|
|
|
|
table
|
|
|
|
}
|
|
|
|
|
2014-01-09 07:05:33 -06:00
|
|
|
fn intern(&mut self, string: &str, primitive_type: PrimTy) {
|
2013-06-26 17:56:13 -05:00
|
|
|
self.primitive_types.insert(token::intern(string), primitive_type);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-07-04 16:53:12 -05:00
|
|
|
/// The main resolver class.
|
2014-11-23 03:29:41 -06:00
|
|
|
struct Resolver<'a, 'tcx:'a> {
|
2014-03-05 08:36:01 -06:00
|
|
|
session: &'a Session,
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2014-11-23 03:29:41 -06:00
|
|
|
ast_map: &'a ast_map::Map<'tcx>,
|
|
|
|
|
2014-04-14 03:30:59 -05:00
|
|
|
graph_root: NameBindings,
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2015-02-11 01:32:25 -06:00
|
|
|
trait_item_map: FnvHashMap<(Name, DefId), DefId>,
|
2014-05-06 18:37:32 -05:00
|
|
|
|
2014-05-08 16:35:09 -05:00
|
|
|
structs: FnvHashMap<DefId, Vec<Name>>,
|
2012-07-11 17:00:40 -05:00
|
|
|
|
2012-05-22 12:54:12 -05:00
|
|
|
// The number of imports that are currently unresolved.
|
2013-02-21 13:08:50 -06:00
|
|
|
unresolved_imports: uint,
|
2012-05-22 12:54:12 -05:00
|
|
|
|
|
|
|
// The module that represents the current item scope.
|
2014-04-14 03:30:59 -05:00
|
|
|
current_module: Rc<Module>,
|
2012-05-22 12:54:12 -05:00
|
|
|
|
|
|
|
// The current set of local scopes, for values.
|
2013-02-14 20:37:25 -06:00
|
|
|
// FIXME #4948: Reuse ribs to avoid allocation.
|
2014-09-29 18:06:13 -05:00
|
|
|
value_ribs: Vec<Rib>,
|
2012-05-22 12:54:12 -05:00
|
|
|
|
|
|
|
// The current set of local scopes, for types.
|
2014-09-29 18:06:13 -05:00
|
|
|
type_ribs: Vec<Rib>,
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2012-08-14 21:20:56 -05:00
|
|
|
// The current set of local scopes, for labels.
|
2014-09-29 18:06:13 -05:00
|
|
|
label_ribs: Vec<Rib>,
|
2012-08-14 21:20:56 -05:00
|
|
|
|
2012-07-11 17:00:40 -05:00
|
|
|
// The trait that the current context can refer to.
|
2014-05-08 16:35:09 -05:00
|
|
|
current_trait_ref: Option<(DefId, TraitRef)>,
|
|
|
|
|
|
|
|
// The current self type if inside an impl (used for better errors).
|
|
|
|
current_self_type: Option<Ty>,
|
2012-07-11 17:00:40 -05:00
|
|
|
|
2012-09-19 20:52:49 -05:00
|
|
|
// The ident for the keyword "self".
|
2014-07-06 18:02:48 -05:00
|
|
|
self_name: Name,
|
2013-01-09 16:12:28 -06:00
|
|
|
// The ident for the non-keyword "Self".
|
2014-07-06 18:02:48 -05:00
|
|
|
type_self_name: Name,
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2012-09-19 20:52:49 -05:00
|
|
|
// The idents for the primitive types.
|
2014-04-14 03:30:59 -05:00
|
|
|
primitive_type_table: PrimitiveTypeTable,
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2013-03-22 21:26:41 -05:00
|
|
|
def_map: DefMap,
|
2014-09-17 21:45:21 -05:00
|
|
|
freevars: RefCell<FreevarMap>,
|
|
|
|
freevars_seen: RefCell<NodeMap<NodeSet>>,
|
2014-12-18 12:27:17 -06:00
|
|
|
export_map: ExportMap,
|
2012-09-06 21:40:15 -05:00
|
|
|
trait_map: TraitMap,
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
external_exports: ExternalExports,
|
2013-04-30 00:15:17 -05:00
|
|
|
|
2013-08-13 19:54:14 -05:00
|
|
|
// Whether or not to print error messages. Can be set to true
|
|
|
|
// when getting additional info for error message suggestions,
|
|
|
|
// so as to avoid printing duplicate errors
|
|
|
|
emit_errors: bool,
|
|
|
|
|
2014-11-23 03:29:41 -06:00
|
|
|
make_glob_map: bool,
|
|
|
|
// Maps imports to the names of items actually imported (this actually maps
|
|
|
|
// all imports, but only glob imports are actually interesting).
|
|
|
|
glob_map: GlobMap,
|
|
|
|
|
2014-02-11 13:19:18 -06:00
|
|
|
used_imports: HashSet<(NodeId, Namespace)>,
|
2014-09-11 12:14:43 -05:00
|
|
|
used_crates: HashSet<CrateNum>,
|
2012-09-07 21:04:40 -05:00
|
|
|
}
|
|
|
|
|
2015-01-03 21:54:18 -06:00
|
|
|
#[derive(PartialEq)]
|
2014-11-06 02:05:53 -06:00
|
|
|
enum FallbackChecks {
|
|
|
|
Everything,
|
|
|
|
OnlyTraitAndStatics
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-11-23 03:29:41 -06:00
|
|
|
impl<'a, 'tcx> Resolver<'a, 'tcx> {
|
|
|
|
fn new(session: &'a Session,
|
|
|
|
ast_map: &'a ast_map::Map<'tcx>,
|
|
|
|
crate_span: Span,
|
|
|
|
make_glob_map: MakeGlobMap) -> Resolver<'a, 'tcx> {
|
2014-05-28 14:36:05 -05:00
|
|
|
let graph_root = NameBindings::new();
|
|
|
|
|
|
|
|
graph_root.define_module(NoParentLink,
|
|
|
|
Some(DefId { krate: 0, node: 0 }),
|
|
|
|
NormalModuleKind,
|
|
|
|
false,
|
|
|
|
true,
|
|
|
|
crate_span);
|
|
|
|
|
|
|
|
let current_module = graph_root.get_module();
|
|
|
|
|
|
|
|
Resolver {
|
|
|
|
session: session,
|
|
|
|
|
2014-11-23 03:29:41 -06:00
|
|
|
ast_map: ast_map,
|
|
|
|
|
2014-05-28 14:36:05 -05:00
|
|
|
// The outermost module has def ID 0; this is not reflected in the
|
|
|
|
// AST.
|
|
|
|
|
|
|
|
graph_root: graph_root,
|
|
|
|
|
2015-01-16 16:27:43 -06:00
|
|
|
trait_item_map: FnvHashMap(),
|
|
|
|
structs: FnvHashMap(),
|
2014-05-28 14:36:05 -05:00
|
|
|
|
|
|
|
unresolved_imports: 0,
|
|
|
|
|
|
|
|
current_module: current_module,
|
2014-09-29 18:06:13 -05:00
|
|
|
value_ribs: Vec::new(),
|
|
|
|
type_ribs: Vec::new(),
|
|
|
|
label_ribs: Vec::new(),
|
2014-05-28 14:36:05 -05:00
|
|
|
|
|
|
|
current_trait_ref: None,
|
|
|
|
current_self_type: None,
|
|
|
|
|
2014-07-06 18:02:48 -05:00
|
|
|
self_name: special_names::self_,
|
|
|
|
type_self_name: special_names::type_self,
|
2014-05-28 14:36:05 -05:00
|
|
|
|
|
|
|
primitive_type_table: PrimitiveTypeTable::new(),
|
|
|
|
|
2015-01-16 16:27:43 -06:00
|
|
|
def_map: RefCell::new(NodeMap()),
|
|
|
|
freevars: RefCell::new(NodeMap()),
|
|
|
|
freevars_seen: RefCell::new(NodeMap()),
|
|
|
|
export_map: NodeMap(),
|
|
|
|
trait_map: NodeMap(),
|
2014-05-28 14:36:05 -05:00
|
|
|
used_imports: HashSet::new(),
|
2014-09-11 12:14:43 -05:00
|
|
|
used_crates: HashSet::new(),
|
2015-01-16 16:27:43 -06:00
|
|
|
external_exports: DefIdSet(),
|
2014-05-28 14:36:05 -05:00
|
|
|
|
|
|
|
emit_errors: true,
|
2014-11-23 03:29:41 -06:00
|
|
|
make_glob_map: make_glob_map == MakeGlobMap::Yes,
|
|
|
|
glob_map: HashMap::new(),
|
2014-05-28 14:36:05 -05:00
|
|
|
}
|
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
|
|
|
|
// Import resolution
|
|
|
|
//
|
|
|
|
// This is a fixed-point algorithm. We resolve imports until our efforts
|
|
|
|
// are stymied by an unresolved import; then we bail out of the current
|
|
|
|
// module and continue. We terminate successfully once no more imports
|
|
|
|
// remain or unsuccessfully when no forward progress in resolving imports
|
|
|
|
// is made.
|
|
|
|
|
2013-05-13 18:13:20 -05:00
|
|
|
/// Resolves all imports for the crate. This method performs the fixed-
|
|
|
|
/// point iteration.
|
2013-10-02 07:33:01 -05:00
|
|
|
fn resolve_imports(&mut self) {
|
2015-01-24 08:39:32 -06:00
|
|
|
let mut i = 0;
|
2012-11-29 14:08:40 -06:00
|
|
|
let mut prev_unresolved_imports = 0;
|
2012-05-22 12:54:12 -05:00
|
|
|
loop {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving imports) iteration {}, {} imports left",
|
2012-08-22 19:24:52 -05:00
|
|
|
i, self.unresolved_imports);
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2013-02-04 16:02:01 -06:00
|
|
|
let module_root = self.graph_root.get_module();
|
2014-04-14 03:30:59 -05:00
|
|
|
self.resolve_imports_for_module_subtree(module_root.clone());
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2012-11-29 14:08:40 -06:00
|
|
|
if self.unresolved_imports == 0 {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving imports) success");
|
2012-05-22 12:54:12 -05:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if self.unresolved_imports == prev_unresolved_imports {
|
|
|
|
self.report_unresolved_imports(module_root);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2012-11-29 14:08:40 -06:00
|
|
|
i += 1;
|
2012-05-22 12:54:12 -05:00
|
|
|
prev_unresolved_imports = self.unresolved_imports;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-01 12:44:43 -06:00
|
|
|
/// Attempts to resolve imports for the given module and all of its
|
|
|
|
/// submodules.
|
2014-04-14 03:30:59 -05:00
|
|
|
fn resolve_imports_for_module_subtree(&mut self, module_: Rc<Module>) {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving imports for module subtree) resolving {}",
|
2014-06-21 05:39:03 -05:00
|
|
|
self.module_to_string(&*module_));
|
2014-06-04 17:55:10 -05:00
|
|
|
let orig_module = replace(&mut self.current_module, module_.clone());
|
2014-04-14 03:30:59 -05:00
|
|
|
self.resolve_imports_for_module(module_.clone());
|
2014-06-04 17:55:10 -05:00
|
|
|
self.current_module = orig_module;
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2014-12-30 12:16:42 -06:00
|
|
|
build_reduced_graph::populate_module_if_necessary(self, &module_);
|
2015-01-31 11:20:46 -06:00
|
|
|
for (_, child_node) in &*module_.children.borrow() {
|
2014-03-20 21:49:20 -05:00
|
|
|
match child_node.get_module_if_available() {
|
|
|
|
None => {
|
|
|
|
// Nothing to do.
|
|
|
|
}
|
|
|
|
Some(child_module) => {
|
|
|
|
self.resolve_imports_for_module_subtree(child_module);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-31 11:20:46 -06:00
|
|
|
for (_, child_module) in &*module_.anonymous_children.borrow() {
|
2014-04-14 03:30:59 -05:00
|
|
|
self.resolve_imports_for_module_subtree(child_module.clone());
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-07-04 16:53:12 -05:00
|
|
|
/// Attempts to resolve imports for the given module only.
|
2014-04-14 03:30:59 -05:00
|
|
|
fn resolve_imports_for_module(&mut self, module: Rc<Module>) {
|
2013-03-01 12:44:43 -06:00
|
|
|
if module.all_imports_resolved() {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving imports for module) all imports resolved for \
|
2013-09-28 00:38:08 -05:00
|
|
|
{}",
|
2014-06-21 05:39:03 -05:00
|
|
|
self.module_to_string(&*module));
|
2012-08-01 19:30:05 -05:00
|
|
|
return;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2014-05-20 23:00:56 -05:00
|
|
|
let imports = module.imports.borrow();
|
2014-03-20 21:49:20 -05:00
|
|
|
let import_count = imports.len();
|
2013-12-19 21:01:02 -06:00
|
|
|
while module.resolved_import_count.get() < import_count {
|
|
|
|
let import_index = module.resolved_import_count.get();
|
2014-10-15 01:05:01 -05:00
|
|
|
let import_directive = &(*imports)[import_index];
|
2014-05-15 17:32:15 -05:00
|
|
|
match self.resolve_import_for_module(module.clone(),
|
|
|
|
import_directive) {
|
2014-06-05 16:37:52 -05:00
|
|
|
Failed(err) => {
|
|
|
|
let (span, help) = match err {
|
|
|
|
Some((span, msg)) => (span, format!(". {}", msg)),
|
|
|
|
None => (import_directive.span, String::new())
|
|
|
|
};
|
|
|
|
let msg = format!("unresolved import `{}`{}",
|
2014-06-21 05:39:03 -05:00
|
|
|
self.import_path_to_string(
|
2015-02-20 13:08:14 -06:00
|
|
|
&import_directive.module_path,
|
2014-06-05 16:37:52 -05:00
|
|
|
import_directive.subclass),
|
|
|
|
help);
|
2015-02-18 13:48:57 -06:00
|
|
|
self.resolve_error(span, &msg[..]);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2014-06-05 16:37:52 -05:00
|
|
|
Indeterminate => break, // Bail out. We'll come around next time.
|
|
|
|
Success(()) => () // Good. Continue.
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2013-12-19 21:01:02 -06:00
|
|
|
module.resolved_import_count
|
|
|
|
.set(module.resolved_import_count.get() + 1);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-09-30 19:11:34 -05:00
|
|
|
fn names_to_string(&self, names: &[Name]) -> String {
|
2013-03-20 00:17:42 -05:00
|
|
|
let mut first = true;
|
2014-05-22 18:57:53 -05:00
|
|
|
let mut result = String::new();
|
2015-01-31 11:20:46 -06:00
|
|
|
for name in names {
|
2013-06-11 21:13:42 -05:00
|
|
|
if first {
|
|
|
|
first = false
|
|
|
|
} else {
|
|
|
|
result.push_str("::")
|
|
|
|
}
|
2015-02-04 14:48:12 -06:00
|
|
|
result.push_str(&token::get_name(*name));
|
2013-02-10 18:33:16 -06:00
|
|
|
};
|
2014-05-09 20:45:36 -05:00
|
|
|
result
|
2012-07-18 18:18:02 -05:00
|
|
|
}
|
2012-12-29 05:44:02 -06:00
|
|
|
|
2015-01-31 13:20:24 -06:00
|
|
|
fn path_names_to_string(&self, path: &Path, depth: usize) -> String {
|
|
|
|
let names: Vec<ast::Name> = path.segments[..path.segments.len()-depth]
|
2014-09-30 19:11:34 -05:00
|
|
|
.iter()
|
|
|
|
.map(|seg| seg.identifier.name)
|
|
|
|
.collect();
|
2015-02-18 13:48:57 -06:00
|
|
|
self.names_to_string(&names[..])
|
2013-08-07 11:47:28 -05:00
|
|
|
}
|
|
|
|
|
2014-06-21 05:39:03 -05:00
|
|
|
fn import_directive_subclass_to_string(&mut self,
|
2014-01-31 14:25:11 -06:00
|
|
|
subclass: ImportDirectiveSubclass)
|
2014-05-22 18:57:53 -05:00
|
|
|
-> String {
|
2012-12-27 13:54:34 -06:00
|
|
|
match subclass {
|
2014-02-13 23:07:09 -06:00
|
|
|
SingleImport(_, source) => {
|
2015-02-03 17:48:39 -06:00
|
|
|
token::get_name(source).to_string()
|
2014-01-31 14:25:11 -06:00
|
|
|
}
|
2014-05-25 05:17:19 -05:00
|
|
|
GlobImport => "*".to_string()
|
2012-12-27 13:54:34 -06:00
|
|
|
}
|
|
|
|
}
|
2012-12-29 05:44:02 -06:00
|
|
|
|
2014-06-21 05:39:03 -05:00
|
|
|
fn import_path_to_string(&mut self,
|
2014-09-30 19:11:34 -05:00
|
|
|
names: &[Name],
|
2014-01-31 14:25:11 -06:00
|
|
|
subclass: ImportDirectiveSubclass)
|
2014-05-22 18:57:53 -05:00
|
|
|
-> String {
|
2014-09-30 19:11:34 -05:00
|
|
|
if names.is_empty() {
|
2014-06-21 05:39:03 -05:00
|
|
|
self.import_directive_subclass_to_string(subclass)
|
2012-12-27 13:54:34 -06:00
|
|
|
} else {
|
2013-09-28 00:38:08 -05:00
|
|
|
(format!("{}::{}",
|
2014-09-30 19:11:34 -05:00
|
|
|
self.names_to_string(names),
|
2014-06-21 05:39:03 -05:00
|
|
|
self.import_directive_subclass_to_string(
|
2014-05-25 05:17:19 -05:00
|
|
|
subclass))).to_string()
|
2012-12-27 13:54:34 -06:00
|
|
|
}
|
|
|
|
}
|
2012-12-29 05:44:02 -06:00
|
|
|
|
2014-11-23 03:29:41 -06:00
|
|
|
#[inline]
|
|
|
|
fn record_import_use(&mut self, import_id: NodeId, name: Name) {
|
|
|
|
if !self.make_glob_map {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if self.glob_map.contains_key(&import_id) {
|
|
|
|
self.glob_map[import_id].insert(name);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
let mut new_set = HashSet::new();
|
|
|
|
new_set.insert(name);
|
|
|
|
self.glob_map.insert(import_id, new_set);
|
|
|
|
}
|
|
|
|
|
|
|
|
fn get_trait_name(&self, did: DefId) -> Name {
|
2014-12-23 13:34:36 -06:00
|
|
|
if did.krate == ast::LOCAL_CRATE {
|
2014-11-23 03:29:41 -06:00
|
|
|
self.ast_map.expect_item(did.node).ident.name
|
|
|
|
} else {
|
|
|
|
csearch::get_trait_name(&self.session.cstore, did)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-01 12:44:43 -06:00
|
|
|
/// Attempts to resolve the given import. The return value indicates
|
|
|
|
/// failure if we're certain the name does not exist, indeterminate if we
|
|
|
|
/// don't know whether the name exists at the moment due to other
|
|
|
|
/// currently-unresolved imports, or success if we know the name exists.
|
|
|
|
/// If successful, the resolved bindings are written into the module.
|
2013-10-02 07:33:01 -05:00
|
|
|
fn resolve_import_for_module(&mut self,
|
2014-04-14 03:30:59 -05:00
|
|
|
module_: Rc<Module>,
|
|
|
|
import_directive: &ImportDirective)
|
2013-12-22 18:39:46 -06:00
|
|
|
-> ResolveResult<()> {
|
2014-06-05 16:37:52 -05:00
|
|
|
let mut resolution_result = Failed(None);
|
2013-03-07 17:37:14 -06:00
|
|
|
let module_path = &import_directive.module_path;
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2014-11-23 03:29:41 -06:00
|
|
|
debug!("(resolving import for module) resolving import `{}::...` in `{}`",
|
2015-02-18 13:48:57 -06:00
|
|
|
self.names_to_string(&module_path[..]),
|
2014-06-21 05:39:03 -05:00
|
|
|
self.module_to_string(&*module_));
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2013-03-01 12:44:43 -06:00
|
|
|
// First, resolve the module path for the directive, if necessary.
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
let container = if module_path.len() == 0 {
|
2013-03-01 12:44:43 -06:00
|
|
|
// Use the crate root.
|
2014-02-11 13:19:18 -06:00
|
|
|
Some((self.graph_root.get_module(), LastMod(AllPublic)))
|
2012-05-22 12:54:12 -05:00
|
|
|
} else {
|
2014-04-14 03:30:59 -05:00
|
|
|
match self.resolve_module_path(module_.clone(),
|
2015-02-18 13:48:57 -06:00
|
|
|
&module_path[..],
|
2013-05-13 18:13:20 -05:00
|
|
|
DontUseLexicalScope,
|
|
|
|
import_directive.span,
|
|
|
|
ImportSearch) {
|
2014-06-05 16:37:52 -05:00
|
|
|
Failed(err) => {
|
|
|
|
resolution_result = Failed(err);
|
|
|
|
None
|
|
|
|
},
|
2012-08-03 21:59:04 -05:00
|
|
|
Indeterminate => {
|
2012-05-22 12:54:12 -05:00
|
|
|
resolution_result = Indeterminate;
|
2013-03-01 12:44:43 -06:00
|
|
|
None
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
Success(container) => Some(container),
|
2013-03-01 12:44:43 -06:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
match container {
|
2013-03-01 12:44:43 -06:00
|
|
|
None => {}
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
Some((containing_module, lp)) => {
|
2013-03-01 12:44:43 -06:00
|
|
|
// We found the module that the target is contained
|
|
|
|
// within. Attempt to resolve the import within it.
|
|
|
|
|
2014-04-14 03:30:59 -05:00
|
|
|
match import_directive.subclass {
|
2013-03-26 21:53:33 -05:00
|
|
|
SingleImport(target, source) => {
|
2013-03-01 12:44:43 -06:00
|
|
|
resolution_result =
|
2014-04-14 03:30:59 -05:00
|
|
|
self.resolve_single_import(&*module_,
|
2013-03-01 12:44:43 -06:00
|
|
|
containing_module,
|
|
|
|
target,
|
2013-05-14 13:19:59 -05:00
|
|
|
source,
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
import_directive,
|
|
|
|
lp);
|
2013-03-01 12:44:43 -06:00
|
|
|
}
|
|
|
|
GlobImport => {
|
|
|
|
resolution_result =
|
2014-04-14 03:30:59 -05:00
|
|
|
self.resolve_glob_import(&*module_,
|
2013-03-01 12:44:43 -06:00
|
|
|
containing_module,
|
2014-08-12 22:31:30 -05:00
|
|
|
import_directive,
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
lp);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Decrement the count of unresolved imports.
|
2012-08-06 14:34:08 -05:00
|
|
|
match resolution_result {
|
2012-08-03 21:59:04 -05:00
|
|
|
Success(()) => {
|
2013-03-28 20:39:09 -05:00
|
|
|
assert!(self.unresolved_imports >= 1);
|
2012-11-29 14:08:40 -06:00
|
|
|
self.unresolved_imports -= 1;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2012-08-03 21:59:04 -05:00
|
|
|
_ => {
|
2012-05-22 12:54:12 -05:00
|
|
|
// Nothing to do here; just return the error.
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Decrement the count of unresolved globs if necessary. But only if
|
|
|
|
// the resolution result is indeterminate -- otherwise we'll stop
|
|
|
|
// processing imports here. (See the loop in
|
|
|
|
// resolve_imports_for_module.)
|
|
|
|
|
2012-09-07 20:53:14 -05:00
|
|
|
if !resolution_result.indeterminate() {
|
2014-04-14 03:30:59 -05:00
|
|
|
match import_directive.subclass {
|
2012-08-03 21:59:04 -05:00
|
|
|
GlobImport => {
|
2013-12-19 20:59:03 -06:00
|
|
|
assert!(module_.glob_count.get() >= 1);
|
|
|
|
module_.glob_count.set(module_.glob_count.get() - 1);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2013-11-28 14:22:53 -06:00
|
|
|
SingleImport(..) => {
|
2012-05-22 12:54:12 -05:00
|
|
|
// Ignore.
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-08-01 19:30:05 -05:00
|
|
|
return resolution_result;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2014-04-14 03:30:59 -05:00
|
|
|
fn create_name_bindings_from_module(module: Rc<Module>) -> NameBindings {
|
2013-03-26 21:53:33 -05:00
|
|
|
NameBindings {
|
2013-12-21 16:13:06 -06:00
|
|
|
type_def: RefCell::new(Some(TypeNsDef {
|
2014-10-19 01:46:08 -05:00
|
|
|
modifiers: IMPORTABLE,
|
2013-03-26 21:53:33 -05:00
|
|
|
module_def: Some(module),
|
|
|
|
type_def: None,
|
2013-05-14 23:49:30 -05:00
|
|
|
type_span: None
|
2013-12-21 16:13:06 -06:00
|
|
|
})),
|
2013-12-21 16:15:07 -06:00
|
|
|
value_def: RefCell::new(None),
|
2013-03-26 21:53:33 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-02 07:33:01 -05:00
|
|
|
fn resolve_single_import(&mut self,
|
2014-04-14 03:30:59 -05:00
|
|
|
module_: &Module,
|
|
|
|
containing_module: Rc<Module>,
|
2014-09-30 19:11:34 -05:00
|
|
|
target: Name,
|
|
|
|
source: Name,
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
directive: &ImportDirective,
|
|
|
|
lp: LastPrivate)
|
2013-05-31 17:17:22 -05:00
|
|
|
-> ResolveResult<()> {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving single import) resolving `{}` = `{}::{}` from \
|
2014-12-20 02:09:35 -06:00
|
|
|
`{}` id {}, last private {:?}",
|
2014-09-30 19:11:34 -05:00
|
|
|
token::get_name(target),
|
2014-06-21 05:39:03 -05:00
|
|
|
self.module_to_string(&*containing_module),
|
2014-09-30 19:11:34 -05:00
|
|
|
token::get_name(source),
|
2014-06-21 05:39:03 -05:00
|
|
|
self.module_to_string(module_),
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
directive.id,
|
|
|
|
lp);
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2014-02-11 13:19:18 -06:00
|
|
|
let lp = match lp {
|
|
|
|
LastMod(lp) => lp,
|
2014-05-09 20:45:36 -05:00
|
|
|
LastImport {..} => {
|
|
|
|
self.session
|
|
|
|
.span_bug(directive.span,
|
|
|
|
"not expecting Import here, must be LastMod")
|
|
|
|
}
|
2014-02-11 13:19:18 -06:00
|
|
|
};
|
|
|
|
|
2012-10-15 16:56:42 -05:00
|
|
|
// We need to resolve both namespaces for this to succeed.
|
2012-05-22 12:54:12 -05:00
|
|
|
//
|
|
|
|
|
|
|
|
let mut value_result = UnknownResult;
|
|
|
|
let mut type_result = UnknownResult;
|
|
|
|
|
|
|
|
// Search for direct children of the containing module.
|
2014-12-30 12:16:42 -06:00
|
|
|
build_reduced_graph::populate_module_if_necessary(self, &containing_module);
|
2013-12-21 17:32:44 -06:00
|
|
|
|
2014-11-06 11:25:16 -06:00
|
|
|
match containing_module.children.borrow().get(&source) {
|
2014-03-20 21:49:20 -05:00
|
|
|
None => {
|
|
|
|
// Continue.
|
|
|
|
}
|
2014-04-14 03:30:59 -05:00
|
|
|
Some(ref child_name_bindings) => {
|
2014-03-20 21:49:20 -05:00
|
|
|
if child_name_bindings.defined_in_namespace(ValueNS) {
|
2014-04-08 16:31:25 -05:00
|
|
|
debug!("(resolving single import) found value binding");
|
2014-04-14 03:30:59 -05:00
|
|
|
value_result = BoundResult(containing_module.clone(),
|
|
|
|
(*child_name_bindings).clone());
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2014-03-20 21:49:20 -05:00
|
|
|
if child_name_bindings.defined_in_namespace(TypeNS) {
|
2014-04-08 16:31:25 -05:00
|
|
|
debug!("(resolving single import) found type binding");
|
2014-04-14 03:30:59 -05:00
|
|
|
type_result = BoundResult(containing_module.clone(),
|
|
|
|
(*child_name_bindings).clone());
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-10-15 16:56:42 -05:00
|
|
|
// Unless we managed to find a result in both namespaces (unlikely),
|
|
|
|
// search imports as well.
|
2014-02-11 13:19:18 -06:00
|
|
|
let mut value_used_reexport = false;
|
|
|
|
let mut type_used_reexport = false;
|
2014-04-14 03:30:59 -05:00
|
|
|
match (value_result.clone(), type_result.clone()) {
|
2013-11-28 14:22:53 -06:00
|
|
|
(BoundResult(..), BoundResult(..)) => {} // Continue.
|
2012-08-03 21:59:04 -05:00
|
|
|
_ => {
|
2012-05-22 12:54:12 -05:00
|
|
|
// If there is an unresolved glob at this point in the
|
|
|
|
// containing module, bail out. We don't know enough to be
|
|
|
|
// able to resolve this import.
|
|
|
|
|
2013-12-19 20:59:03 -06:00
|
|
|
if containing_module.glob_count.get() > 0 {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving single import) unresolved glob; \
|
2012-08-22 19:24:52 -05:00
|
|
|
bailing out");
|
2012-08-01 19:30:05 -05:00
|
|
|
return Indeterminate;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2014-04-14 03:30:59 -05:00
|
|
|
// Now search the exported imports within the containing module.
|
2014-11-06 11:25:16 -06:00
|
|
|
match containing_module.import_resolutions.borrow().get(&source) {
|
2012-08-20 14:23:37 -05:00
|
|
|
None => {
|
2014-04-08 16:31:25 -05:00
|
|
|
debug!("(resolving single import) no import");
|
2012-05-22 12:54:12 -05:00
|
|
|
// The containing module definitely doesn't have an
|
|
|
|
// exported import with the name in question. We can
|
|
|
|
// therefore accurately report that the names are
|
|
|
|
// unbound.
|
|
|
|
|
2012-08-27 18:26:35 -05:00
|
|
|
if value_result.is_unknown() {
|
2012-05-22 12:54:12 -05:00
|
|
|
value_result = UnboundResult;
|
|
|
|
}
|
2012-08-27 18:26:35 -05:00
|
|
|
if type_result.is_unknown() {
|
2012-05-22 12:54:12 -05:00
|
|
|
type_result = UnboundResult;
|
|
|
|
}
|
|
|
|
}
|
2012-08-20 14:23:37 -05:00
|
|
|
Some(import_resolution)
|
2014-04-14 03:30:59 -05:00
|
|
|
if import_resolution.outstanding_references == 0 => {
|
2012-07-06 21:06:58 -05:00
|
|
|
|
2013-09-26 21:10:16 -05:00
|
|
|
fn get_binding(this: &mut Resolver,
|
2014-04-14 03:30:59 -05:00
|
|
|
import_resolution: &ImportResolution,
|
2014-11-23 03:29:41 -06:00
|
|
|
namespace: Namespace,
|
|
|
|
source: &Name)
|
2012-05-22 12:54:12 -05:00
|
|
|
-> NamespaceResult {
|
2012-11-29 14:08:40 -06:00
|
|
|
|
2012-10-02 20:13:56 -05:00
|
|
|
// Import resolutions must be declared with "pub"
|
|
|
|
// in order to be exported.
|
2014-04-14 03:30:59 -05:00
|
|
|
if !import_resolution.is_public {
|
2012-10-02 20:13:56 -05:00
|
|
|
return UnboundResult;
|
|
|
|
}
|
|
|
|
|
2014-04-14 03:30:59 -05:00
|
|
|
match import_resolution.
|
2012-05-22 12:54:12 -05:00
|
|
|
target_for_namespace(namespace) {
|
2012-08-20 14:23:37 -05:00
|
|
|
None => {
|
2012-08-01 19:30:05 -05:00
|
|
|
return UnboundResult;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2014-08-12 22:31:30 -05:00
|
|
|
Some(Target {
|
|
|
|
target_module,
|
|
|
|
bindings,
|
|
|
|
shadowable: _
|
|
|
|
}) => {
|
2014-04-08 16:31:25 -05:00
|
|
|
debug!("(resolving single import) found \
|
2014-12-20 02:09:35 -06:00
|
|
|
import in ns {:?}", namespace);
|
2013-06-09 23:39:15 -05:00
|
|
|
let id = import_resolution.id(namespace);
|
2014-09-11 12:14:43 -05:00
|
|
|
// track used imports and extern crates as well
|
2014-02-11 13:19:18 -06:00
|
|
|
this.used_imports.insert((id, namespace));
|
2014-11-23 03:29:41 -06:00
|
|
|
this.record_import_use(id, *source);
|
2014-09-11 12:14:43 -05:00
|
|
|
match target_module.def_id.get() {
|
|
|
|
Some(DefId{krate: kid, ..}) => {
|
|
|
|
this.used_crates.insert(kid);
|
|
|
|
},
|
|
|
|
_ => {}
|
|
|
|
}
|
2014-04-14 03:30:59 -05:00
|
|
|
return BoundResult(target_module, bindings);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// The name is an import which has been fully
|
|
|
|
// resolved. We can, therefore, just follow it.
|
2012-08-27 18:26:35 -05:00
|
|
|
if value_result.is_unknown() {
|
2014-11-23 03:29:41 -06:00
|
|
|
value_result = get_binding(self,
|
|
|
|
import_resolution,
|
|
|
|
ValueNS,
|
|
|
|
&source);
|
2014-04-14 03:30:59 -05:00
|
|
|
value_used_reexport = import_resolution.is_public;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2012-08-27 18:26:35 -05:00
|
|
|
if type_result.is_unknown() {
|
2014-11-23 03:29:41 -06:00
|
|
|
type_result = get_binding(self,
|
|
|
|
import_resolution,
|
|
|
|
TypeNS,
|
|
|
|
&source);
|
2014-04-14 03:30:59 -05:00
|
|
|
type_used_reexport = import_resolution.is_public;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2012-08-20 14:23:37 -05:00
|
|
|
Some(_) => {
|
2014-12-04 07:21:44 -06:00
|
|
|
// If containing_module is the same module whose import we are resolving
|
|
|
|
// and there it has an unresolved import with the same name as `source`,
|
|
|
|
// then the user is actually trying to import an item that is declared
|
|
|
|
// in the same scope
|
|
|
|
//
|
|
|
|
// e.g
|
|
|
|
// use self::submodule;
|
|
|
|
// pub mod submodule;
|
|
|
|
//
|
|
|
|
// In this case we continue as if we resolved the import and let the
|
|
|
|
// check_for_conflicts_between_imports_and_items call below handle
|
|
|
|
// the conflict
|
|
|
|
match (module_.def_id.get(), containing_module.def_id.get()) {
|
|
|
|
(Some(id1), Some(id2)) if id1 == id2 => {
|
|
|
|
if value_result.is_unknown() {
|
|
|
|
value_result = UnboundResult;
|
|
|
|
}
|
|
|
|
if type_result.is_unknown() {
|
|
|
|
type_result = UnboundResult;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_ => {
|
|
|
|
// The import is unresolved. Bail out.
|
|
|
|
debug!("(resolving single import) unresolved import; \
|
|
|
|
bailing out");
|
|
|
|
return Indeterminate;
|
|
|
|
}
|
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-26 21:53:33 -05:00
|
|
|
// If we didn't find a result in the type namespace, search the
|
|
|
|
// external modules.
|
2014-02-11 13:19:18 -06:00
|
|
|
let mut value_used_public = false;
|
|
|
|
let mut type_used_public = false;
|
2013-03-26 21:53:33 -05:00
|
|
|
match type_result {
|
2013-11-28 14:22:53 -06:00
|
|
|
BoundResult(..) => {}
|
2013-03-26 21:53:33 -05:00
|
|
|
_ => {
|
2014-03-20 21:49:20 -05:00
|
|
|
match containing_module.external_module_children.borrow_mut()
|
2014-11-07 13:35:18 -06:00
|
|
|
.get(&source).cloned() {
|
2013-03-26 21:53:33 -05:00
|
|
|
None => {} // Continue.
|
|
|
|
Some(module) => {
|
2014-04-08 16:31:25 -05:00
|
|
|
debug!("(resolving single import) found external \
|
|
|
|
module");
|
2014-09-11 12:14:43 -05:00
|
|
|
// track the module as used.
|
|
|
|
match module.def_id.get() {
|
|
|
|
Some(DefId{krate: kid, ..}) => { self.used_crates.insert(kid); },
|
|
|
|
_ => {}
|
|
|
|
}
|
2013-03-26 21:53:33 -05:00
|
|
|
let name_bindings =
|
2014-04-14 03:30:59 -05:00
|
|
|
Rc::new(Resolver::create_name_bindings_from_module(
|
|
|
|
module));
|
|
|
|
type_result = BoundResult(containing_module.clone(),
|
2013-03-26 21:53:33 -05:00
|
|
|
name_bindings);
|
2014-02-11 13:19:18 -06:00
|
|
|
type_used_public = true;
|
2013-03-26 21:53:33 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-05-22 12:54:12 -05:00
|
|
|
// We've successfully resolved the import. Write the results in.
|
2014-04-14 03:30:59 -05:00
|
|
|
let mut import_resolutions = module_.import_resolutions.borrow_mut();
|
2014-10-23 10:42:21 -05:00
|
|
|
let import_resolution = &mut (*import_resolutions)[target];
|
2014-12-28 17:31:17 -06:00
|
|
|
{
|
2015-02-01 11:44:15 -06:00
|
|
|
let mut check_and_write_import = |namespace, result: &_, used_public: &mut bool| {
|
2014-12-28 17:31:17 -06:00
|
|
|
let namespace_name = match namespace {
|
|
|
|
TypeNS => "type",
|
|
|
|
ValueNS => "value",
|
|
|
|
};
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2014-12-28 17:31:17 -06:00
|
|
|
match *result {
|
|
|
|
BoundResult(ref target_module, ref name_bindings) => {
|
2014-12-20 02:09:35 -06:00
|
|
|
debug!("(resolving single import) found {:?} target: {:?}",
|
2014-12-28 17:31:17 -06:00
|
|
|
namespace_name,
|
|
|
|
name_bindings.def_for_namespace(namespace));
|
|
|
|
self.check_for_conflicting_import(
|
|
|
|
&import_resolution.target_for_namespace(namespace),
|
|
|
|
directive.span,
|
|
|
|
target,
|
|
|
|
namespace);
|
|
|
|
|
|
|
|
self.check_that_import_is_importable(
|
|
|
|
&**name_bindings,
|
|
|
|
directive.span,
|
|
|
|
target,
|
|
|
|
namespace);
|
|
|
|
|
|
|
|
let target = Some(Target::new(target_module.clone(),
|
|
|
|
name_bindings.clone(),
|
|
|
|
directive.shadowable));
|
|
|
|
import_resolution.set_target_and_id(namespace, target, directive.id);
|
|
|
|
import_resolution.is_public = directive.is_public;
|
|
|
|
*used_public = name_bindings.defined_in_public_namespace(namespace);
|
|
|
|
}
|
|
|
|
UnboundResult => { /* Continue. */ }
|
|
|
|
UnknownResult => {
|
2014-12-20 02:09:35 -06:00
|
|
|
panic!("{:?} result should be known at this point", namespace_name);
|
2014-12-28 17:31:17 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
check_and_write_import(ValueNS, &value_result, &mut value_used_public);
|
|
|
|
check_and_write_import(TypeNS, &type_result, &mut type_used_public);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2014-08-12 22:31:30 -05:00
|
|
|
self.check_for_conflicts_between_imports_and_items(
|
|
|
|
module_,
|
|
|
|
import_resolution,
|
|
|
|
directive.span,
|
2014-09-30 19:11:34 -05:00
|
|
|
target);
|
2014-08-12 22:31:30 -05:00
|
|
|
|
2014-04-08 17:03:29 -05:00
|
|
|
if value_result.is_unbound() && type_result.is_unbound() {
|
2014-06-05 16:37:52 -05:00
|
|
|
let msg = format!("There is no `{}` in `{}`",
|
2014-09-30 19:11:34 -05:00
|
|
|
token::get_name(source),
|
2014-06-21 05:39:03 -05:00
|
|
|
self.module_to_string(&*containing_module));
|
2014-06-05 16:37:52 -05:00
|
|
|
return Failed(Some((directive.span, msg)));
|
2013-05-12 08:03:39 -05:00
|
|
|
}
|
2014-02-11 13:19:18 -06:00
|
|
|
let value_used_public = value_used_reexport || value_used_public;
|
|
|
|
let type_used_public = type_used_reexport || type_used_public;
|
2013-05-12 08:03:39 -05:00
|
|
|
|
2014-04-14 03:30:59 -05:00
|
|
|
assert!(import_resolution.outstanding_references >= 1);
|
|
|
|
import_resolution.outstanding_references -= 1;
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2013-09-24 15:56:52 -05:00
|
|
|
// record what this import resolves to for later uses in documentation,
|
|
|
|
// this may resolve to either a value or a type, but for documentation
|
|
|
|
// purposes it's good enough to just favor one over the other.
|
2015-02-16 22:44:23 -06:00
|
|
|
let value_def_and_priv = import_resolution.value_target.as_ref().map(|target| {
|
|
|
|
let def = target.bindings.def_for_namespace(ValueNS).unwrap();
|
|
|
|
(def, if value_used_public { lp } else { DependsOn(def.def_id()) })
|
|
|
|
});
|
|
|
|
let type_def_and_priv = import_resolution.type_target.as_ref().map(|target| {
|
|
|
|
let def = target.bindings.def_for_namespace(TypeNS).unwrap();
|
|
|
|
(def, if type_used_public { lp } else { DependsOn(def.def_id()) })
|
|
|
|
});
|
|
|
|
|
|
|
|
let import_lp = LastImport {
|
|
|
|
value_priv: value_def_and_priv.map(|(_, p)| p),
|
|
|
|
value_used: Used,
|
|
|
|
type_priv: type_def_and_priv.map(|(_, p)| p),
|
|
|
|
type_used: Used
|
2014-02-11 13:19:18 -06:00
|
|
|
};
|
|
|
|
|
2015-02-16 22:44:23 -06:00
|
|
|
if let Some((def, _)) = value_def_and_priv {
|
|
|
|
self.def_map.borrow_mut().insert(directive.id, PathResolution {
|
|
|
|
base_def: def,
|
|
|
|
last_private: import_lp,
|
|
|
|
depth: 0
|
|
|
|
});
|
|
|
|
}
|
|
|
|
if let Some((def, _)) = type_def_and_priv {
|
|
|
|
self.def_map.borrow_mut().insert(directive.id, PathResolution {
|
|
|
|
base_def: def,
|
|
|
|
last_private: import_lp,
|
|
|
|
depth: 0
|
|
|
|
});
|
|
|
|
}
|
2013-09-24 15:56:52 -05:00
|
|
|
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving single import) successfully resolved import");
|
2012-08-01 19:30:05 -05:00
|
|
|
return Success(());
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2014-11-23 03:29:41 -06:00
|
|
|
// Resolves a glob import. Note that this function cannot fail; it either
|
2013-03-26 21:53:33 -05:00
|
|
|
// succeeds or bails out (as importing * from an empty module or a module
|
2014-12-28 17:31:17 -06:00
|
|
|
// that exports nothing is valid). containing_module is the module we are
|
|
|
|
// actually importing, i.e., `foo` in `use foo::*`.
|
2013-10-02 07:33:01 -05:00
|
|
|
fn resolve_glob_import(&mut self,
|
2014-04-14 03:30:59 -05:00
|
|
|
module_: &Module,
|
|
|
|
containing_module: Rc<Module>,
|
2014-08-12 22:31:30 -05:00
|
|
|
import_directive: &ImportDirective,
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
lp: LastPrivate)
|
|
|
|
-> ResolveResult<()> {
|
2014-08-12 22:31:30 -05:00
|
|
|
let id = import_directive.id;
|
|
|
|
let is_public = import_directive.is_public;
|
|
|
|
|
2012-05-22 12:54:12 -05:00
|
|
|
// This function works in a highly imperative manner; it eagerly adds
|
|
|
|
// everything it can to the list of import resolutions of the module
|
|
|
|
// node.
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving glob import) resolving glob import {}", id);
|
2012-05-22 12:54:12 -05:00
|
|
|
|
|
|
|
// We must bail out if the node has unresolved imports of any kind
|
|
|
|
// (including globs).
|
|
|
|
if !(*containing_module).all_imports_resolved() {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving glob import) target module has unresolved \
|
2012-08-22 19:24:52 -05:00
|
|
|
imports; bailing out");
|
2012-08-01 19:30:05 -05:00
|
|
|
return Indeterminate;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2013-12-19 20:59:03 -06:00
|
|
|
assert_eq!(containing_module.glob_count.get(), 0);
|
2012-05-22 12:54:12 -05:00
|
|
|
|
|
|
|
// Add all resolved imports from the containing module.
|
2014-12-28 17:31:17 -06:00
|
|
|
let import_resolutions = containing_module.import_resolutions.borrow();
|
2015-01-31 11:20:46 -06:00
|
|
|
for (ident, target_import_resolution) in &*import_resolutions {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving glob import) writing module resolution \
|
2014-10-15 01:25:34 -05:00
|
|
|
{} into `{}`",
|
2014-12-28 17:31:17 -06:00
|
|
|
token::get_name(*ident),
|
2014-06-21 05:39:03 -05:00
|
|
|
self.module_to_string(module_));
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2014-04-14 03:30:59 -05:00
|
|
|
if !target_import_resolution.is_public {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving glob import) nevermind, just kidding");
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
2012-05-22 12:54:12 -05:00
|
|
|
// Here we merge two import resolutions.
|
2014-03-20 21:49:20 -05:00
|
|
|
let mut import_resolutions = module_.import_resolutions.borrow_mut();
|
2014-11-06 11:25:16 -06:00
|
|
|
match import_resolutions.get_mut(ident) {
|
2014-04-14 03:30:59 -05:00
|
|
|
Some(dest_import_resolution) => {
|
2012-05-22 12:54:12 -05:00
|
|
|
// Merge the two import resolutions at a finer-grained
|
|
|
|
// level.
|
|
|
|
|
2014-04-14 03:30:59 -05:00
|
|
|
match target_import_resolution.value_target {
|
2012-08-20 14:23:37 -05:00
|
|
|
None => {
|
2012-05-22 12:54:12 -05:00
|
|
|
// Continue.
|
|
|
|
}
|
2014-04-14 03:30:59 -05:00
|
|
|
Some(ref value_target) => {
|
2014-12-28 19:33:46 -06:00
|
|
|
self.check_for_conflicting_import(&dest_import_resolution.value_target,
|
|
|
|
import_directive.span,
|
|
|
|
*ident,
|
|
|
|
ValueNS);
|
2014-12-28 17:31:17 -06:00
|
|
|
dest_import_resolution.value_target = Some(value_target.clone());
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
2014-04-14 03:30:59 -05:00
|
|
|
match target_import_resolution.type_target {
|
2012-08-20 14:23:37 -05:00
|
|
|
None => {
|
2012-05-22 12:54:12 -05:00
|
|
|
// Continue.
|
|
|
|
}
|
2014-04-14 03:30:59 -05:00
|
|
|
Some(ref type_target) => {
|
2014-12-28 19:33:46 -06:00
|
|
|
self.check_for_conflicting_import(&dest_import_resolution.type_target,
|
|
|
|
import_directive.span,
|
|
|
|
*ident,
|
|
|
|
TypeNS);
|
2014-12-28 17:31:17 -06:00
|
|
|
dest_import_resolution.type_target = Some(type_target.clone());
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
2014-04-14 03:30:59 -05:00
|
|
|
dest_import_resolution.is_public = is_public;
|
|
|
|
continue;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2014-04-14 03:30:59 -05:00
|
|
|
None => {}
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2014-04-14 03:30:59 -05:00
|
|
|
|
|
|
|
// Simple: just copy the old import resolution.
|
|
|
|
let mut new_import_resolution = ImportResolution::new(id, is_public);
|
|
|
|
new_import_resolution.value_target =
|
|
|
|
target_import_resolution.value_target.clone();
|
|
|
|
new_import_resolution.type_target =
|
|
|
|
target_import_resolution.type_target.clone();
|
|
|
|
|
|
|
|
import_resolutions.insert(*ident, new_import_resolution);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2013-03-26 21:53:33 -05:00
|
|
|
// Add all children from the containing module.
|
2014-12-30 12:16:42 -06:00
|
|
|
build_reduced_graph::populate_module_if_necessary(self, &containing_module);
|
2013-12-21 17:32:44 -06:00
|
|
|
|
2015-01-31 11:20:46 -06:00
|
|
|
for (&name, name_bindings) in &*containing_module.children.borrow() {
|
2014-08-12 22:31:30 -05:00
|
|
|
self.merge_import_resolution(module_,
|
|
|
|
containing_module.clone(),
|
|
|
|
import_directive,
|
|
|
|
name,
|
|
|
|
name_bindings.clone());
|
|
|
|
|
2013-03-26 21:53:33 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// Add external module children from the containing module.
|
2015-01-31 11:20:46 -06:00
|
|
|
for (&name, module) in &*containing_module.external_module_children.borrow() {
|
2014-03-20 21:49:20 -05:00
|
|
|
let name_bindings =
|
2014-04-14 03:30:59 -05:00
|
|
|
Rc::new(Resolver::create_name_bindings_from_module(module.clone()));
|
2014-08-12 22:31:30 -05:00
|
|
|
self.merge_import_resolution(module_,
|
|
|
|
containing_module.clone(),
|
|
|
|
import_directive,
|
|
|
|
name,
|
|
|
|
name_bindings);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2013-09-24 15:56:52 -05:00
|
|
|
// Record the destination of this import
|
2015-02-16 22:44:23 -06:00
|
|
|
if let Some(did) = containing_module.def_id.get() {
|
|
|
|
self.def_map.borrow_mut().insert(id, PathResolution {
|
|
|
|
base_def: DefMod(did),
|
|
|
|
last_private: lp,
|
|
|
|
depth: 0
|
|
|
|
});
|
2013-09-24 15:56:52 -05:00
|
|
|
}
|
|
|
|
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving glob import) successfully resolved import");
|
2012-08-01 19:30:05 -05:00
|
|
|
return Success(());
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2014-02-07 13:45:18 -06:00
|
|
|
fn merge_import_resolution(&mut self,
|
2014-04-14 03:30:59 -05:00
|
|
|
module_: &Module,
|
|
|
|
containing_module: Rc<Module>,
|
2014-08-12 22:31:30 -05:00
|
|
|
import_directive: &ImportDirective,
|
2014-02-07 13:45:18 -06:00
|
|
|
name: Name,
|
2014-04-14 03:30:59 -05:00
|
|
|
name_bindings: Rc<NameBindings>) {
|
2014-08-12 22:31:30 -05:00
|
|
|
let id = import_directive.id;
|
|
|
|
let is_public = import_directive.is_public;
|
|
|
|
|
2014-02-07 13:45:18 -06:00
|
|
|
let mut import_resolutions = module_.import_resolutions.borrow_mut();
|
2015-01-06 10:36:30 -06:00
|
|
|
let dest_import_resolution = import_resolutions.entry(name).get().unwrap_or_else(
|
2015-01-04 13:07:32 -06:00
|
|
|
|vacant_entry| {
|
2014-09-18 16:05:52 -05:00
|
|
|
// Create a new import resolution from this child.
|
2015-01-04 13:07:32 -06:00
|
|
|
vacant_entry.insert(ImportResolution::new(id, is_public))
|
|
|
|
});
|
2014-02-07 13:45:18 -06:00
|
|
|
|
|
|
|
debug!("(resolving glob import) writing resolution `{}` in `{}` \
|
|
|
|
to `{}`",
|
2015-02-04 14:48:12 -06:00
|
|
|
&token::get_name(name),
|
2014-06-21 05:39:03 -05:00
|
|
|
self.module_to_string(&*containing_module),
|
|
|
|
self.module_to_string(module_));
|
2014-02-07 13:45:18 -06:00
|
|
|
|
|
|
|
// Merge the child item into the import resolution.
|
2014-12-28 17:31:17 -06:00
|
|
|
{
|
2015-02-01 11:44:15 -06:00
|
|
|
let mut merge_child_item = |namespace| {
|
2014-12-28 17:31:17 -06:00
|
|
|
if name_bindings.defined_in_namespace_with(namespace, IMPORTABLE | PUBLIC) {
|
|
|
|
let namespace_name = match namespace {
|
|
|
|
TypeNS => "type",
|
|
|
|
ValueNS => "value",
|
|
|
|
};
|
|
|
|
debug!("(resolving glob import) ... for {} target", namespace_name);
|
|
|
|
if dest_import_resolution.shadowable(namespace) == Shadowable::Never {
|
|
|
|
let msg = format!("a {} named `{}` has already been imported \
|
|
|
|
in this module",
|
|
|
|
namespace_name,
|
2015-02-04 14:48:12 -06:00
|
|
|
&token::get_name(name));
|
2015-02-01 20:53:25 -06:00
|
|
|
span_err!(self.session, import_directive.span, E0251, "{}", msg);
|
2014-12-28 17:31:17 -06:00
|
|
|
} else {
|
|
|
|
let target = Target::new(containing_module.clone(),
|
|
|
|
name_bindings.clone(),
|
|
|
|
import_directive.shadowable);
|
|
|
|
dest_import_resolution.set_target_and_id(namespace,
|
|
|
|
Some(target),
|
|
|
|
id);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
merge_child_item(ValueNS);
|
|
|
|
merge_child_item(TypeNS);
|
2014-02-07 13:45:18 -06:00
|
|
|
}
|
2014-12-28 17:31:17 -06:00
|
|
|
|
2014-04-14 03:30:59 -05:00
|
|
|
dest_import_resolution.is_public = is_public;
|
2014-08-12 22:31:30 -05:00
|
|
|
|
|
|
|
self.check_for_conflicts_between_imports_and_items(
|
|
|
|
module_,
|
|
|
|
dest_import_resolution,
|
|
|
|
import_directive.span,
|
|
|
|
name);
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Checks that imported names and items don't have the same name.
|
|
|
|
fn check_for_conflicting_import(&mut self,
|
|
|
|
target: &Option<Target>,
|
|
|
|
import_span: Span,
|
|
|
|
name: Name,
|
|
|
|
namespace: Namespace) {
|
2014-12-28 17:31:17 -06:00
|
|
|
debug!("check_for_conflicting_import: {}; target exists: {}",
|
2015-02-04 14:48:12 -06:00
|
|
|
&token::get_name(name),
|
2014-12-28 17:31:17 -06:00
|
|
|
target.is_some());
|
|
|
|
|
2014-08-12 22:31:30 -05:00
|
|
|
match *target {
|
2014-11-23 03:29:41 -06:00
|
|
|
Some(ref target) if target.shadowable != Shadowable::Always => {
|
2014-08-12 22:31:30 -05:00
|
|
|
let msg = format!("a {} named `{}` has already been imported \
|
|
|
|
in this module",
|
|
|
|
match namespace {
|
|
|
|
TypeNS => "type",
|
|
|
|
ValueNS => "value",
|
|
|
|
},
|
2015-02-04 14:48:12 -06:00
|
|
|
&token::get_name(name));
|
2015-02-18 13:48:57 -06:00
|
|
|
span_err!(self.session, import_span, E0252, "{}", &msg[..]);
|
2014-08-12 22:31:30 -05:00
|
|
|
}
|
|
|
|
Some(_) | None => {}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-10-19 01:46:08 -05:00
|
|
|
/// Checks that an import is actually importable
|
|
|
|
fn check_that_import_is_importable(&mut self,
|
|
|
|
name_bindings: &NameBindings,
|
|
|
|
import_span: Span,
|
|
|
|
name: Name,
|
|
|
|
namespace: Namespace) {
|
|
|
|
if !name_bindings.defined_in_namespace_with(namespace, IMPORTABLE) {
|
|
|
|
let msg = format!("`{}` is not directly importable",
|
|
|
|
token::get_name(name));
|
2015-02-18 13:48:57 -06:00
|
|
|
span_err!(self.session, import_span, E0253, "{}", &msg[..]);
|
2014-10-19 01:46:08 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-08-12 22:31:30 -05:00
|
|
|
/// Checks that imported names and items don't have the same name.
|
|
|
|
fn check_for_conflicts_between_imports_and_items(&mut self,
|
|
|
|
module: &Module,
|
|
|
|
import_resolution:
|
2014-12-04 07:21:44 -06:00
|
|
|
&ImportResolution,
|
2014-08-12 22:31:30 -05:00
|
|
|
import_span: Span,
|
|
|
|
name: Name) {
|
|
|
|
// First, check for conflicts between imports and `extern crate`s.
|
|
|
|
if module.external_module_children
|
|
|
|
.borrow()
|
|
|
|
.contains_key(&name) {
|
|
|
|
match import_resolution.type_target {
|
2014-11-23 03:29:41 -06:00
|
|
|
Some(ref target) if target.shadowable != Shadowable::Always => {
|
2014-12-06 19:51:58 -06:00
|
|
|
let msg = format!("import `{0}` conflicts with imported \
|
|
|
|
crate in this module \
|
|
|
|
(maybe you meant `use {0}::*`?)",
|
2015-02-04 14:48:12 -06:00
|
|
|
&token::get_name(name));
|
2015-02-18 13:48:57 -06:00
|
|
|
span_err!(self.session, import_span, E0254, "{}", &msg[..]);
|
2014-08-12 22:31:30 -05:00
|
|
|
}
|
|
|
|
Some(_) | None => {}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check for item conflicts.
|
|
|
|
let children = module.children.borrow();
|
2014-11-06 11:25:16 -06:00
|
|
|
let name_bindings = match children.get(&name) {
|
2014-08-12 22:31:30 -05:00
|
|
|
None => {
|
|
|
|
// There can't be any conflicts.
|
|
|
|
return
|
|
|
|
}
|
|
|
|
Some(ref name_bindings) => (*name_bindings).clone(),
|
|
|
|
};
|
|
|
|
|
|
|
|
match import_resolution.value_target {
|
2014-11-23 03:29:41 -06:00
|
|
|
Some(ref target) if target.shadowable != Shadowable::Always => {
|
2014-11-29 15:41:21 -06:00
|
|
|
if let Some(ref value) = *name_bindings.value_def.borrow() {
|
2015-02-20 00:17:05 -06:00
|
|
|
span_err!(self.session, import_span, E0255,
|
|
|
|
"import `{}` conflicts with value in this module",
|
|
|
|
&token::get_name(name));
|
2014-11-29 15:41:21 -06:00
|
|
|
if let Some(span) = value.value_span {
|
2015-02-20 00:17:05 -06:00
|
|
|
self.session.span_note(span, "conflicting value here");
|
2014-08-12 22:31:30 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Some(_) | None => {}
|
|
|
|
}
|
|
|
|
|
|
|
|
match import_resolution.type_target {
|
2014-11-23 03:29:41 -06:00
|
|
|
Some(ref target) if target.shadowable != Shadowable::Always => {
|
2014-11-29 15:41:21 -06:00
|
|
|
if let Some(ref ty) = *name_bindings.type_def.borrow() {
|
2015-02-20 00:17:05 -06:00
|
|
|
let (what, note) = if ty.module_def.is_some() {
|
|
|
|
("existing submodule", "note conflicting module here")
|
|
|
|
} else {
|
|
|
|
("type in this module", "note conflicting type here")
|
|
|
|
};
|
|
|
|
span_err!(self.session, import_span, E0256,
|
|
|
|
"import `{}` conflicts with {}",
|
|
|
|
&token::get_name(name), what);
|
|
|
|
if let Some(span) = ty.type_span {
|
|
|
|
self.session.span_note(span, note);
|
2014-08-12 22:31:30 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Some(_) | None => {}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Checks that the names of external crates don't collide with other
|
|
|
|
/// external crates.
|
|
|
|
fn check_for_conflicts_between_external_crates(&self,
|
|
|
|
module: &Module,
|
|
|
|
name: Name,
|
|
|
|
span: Span) {
|
|
|
|
if module.external_module_children.borrow().contains_key(&name) {
|
2015-01-18 15:46:57 -06:00
|
|
|
span_err!(self.session, span, E0259,
|
|
|
|
"an external crate named `{}` has already \
|
2014-08-12 22:31:30 -05:00
|
|
|
been imported into this module",
|
2015-02-04 14:48:12 -06:00
|
|
|
&token::get_name(name));
|
2014-08-12 22:31:30 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Checks that the names of items don't collide with external crates.
|
|
|
|
fn check_for_conflicts_between_external_crates_and_items(&self,
|
|
|
|
module: &Module,
|
|
|
|
name: Name,
|
|
|
|
span: Span) {
|
|
|
|
if module.external_module_children.borrow().contains_key(&name) {
|
2015-01-18 15:46:57 -06:00
|
|
|
span_err!(self.session, span, E0260,
|
|
|
|
"the name `{}` conflicts with an external \
|
2014-08-12 22:31:30 -05:00
|
|
|
crate that has been imported into this \
|
|
|
|
module",
|
2015-02-04 14:48:12 -06:00
|
|
|
&token::get_name(name));
|
2014-08-12 22:31:30 -05:00
|
|
|
}
|
2014-02-07 13:45:18 -06:00
|
|
|
}
|
|
|
|
|
2013-03-01 12:44:43 -06:00
|
|
|
/// Resolves the given module path from the given root `module_`.
|
2013-10-02 07:33:01 -05:00
|
|
|
fn resolve_module_path_from_root(&mut self,
|
2014-04-14 03:30:59 -05:00
|
|
|
module_: Rc<Module>,
|
2014-09-30 19:11:34 -05:00
|
|
|
module_path: &[Name],
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
index: uint,
|
|
|
|
span: Span,
|
|
|
|
name_search_type: NameSearchType,
|
|
|
|
lp: LastPrivate)
|
2014-04-14 03:30:59 -05:00
|
|
|
-> ResolveResult<(Rc<Module>, LastPrivate)> {
|
2014-06-04 17:55:10 -05:00
|
|
|
fn search_parent_externals(needle: Name, module: &Rc<Module>)
|
|
|
|
-> Option<Rc<Module>> {
|
2015-02-13 01:33:44 -06:00
|
|
|
match module.external_module_children.borrow().get(&needle) {
|
|
|
|
Some(_) => Some(module.clone()),
|
|
|
|
None => match module.parent_link {
|
|
|
|
ModuleParentLink(ref parent, _) => {
|
|
|
|
search_parent_externals(needle, &parent.upgrade().unwrap())
|
2014-06-04 17:55:10 -05:00
|
|
|
}
|
|
|
|
_ => None
|
|
|
|
}
|
2015-02-13 01:33:44 -06:00
|
|
|
}
|
2014-06-04 17:55:10 -05:00
|
|
|
}
|
|
|
|
|
2012-07-31 18:38:41 -05:00
|
|
|
let mut search_module = module_;
|
2012-05-22 12:54:12 -05:00
|
|
|
let mut index = index;
|
2013-03-07 17:37:14 -06:00
|
|
|
let module_path_len = module_path.len();
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
let mut closest_private = lp;
|
2012-05-22 12:54:12 -05:00
|
|
|
|
|
|
|
// Resolve the module part of the path. This does not involve looking
|
|
|
|
// upward though scope chains; we simply resolve names directly in
|
|
|
|
// modules as we go.
|
|
|
|
while index < module_path_len {
|
2013-03-07 17:37:14 -06:00
|
|
|
let name = module_path[index];
|
2014-04-14 03:30:59 -05:00
|
|
|
match self.resolve_name_in_module(search_module.clone(),
|
2014-09-30 19:11:34 -05:00
|
|
|
name,
|
2012-12-13 15:05:22 -06:00
|
|
|
TypeNS,
|
2014-04-08 16:31:25 -05:00
|
|
|
name_search_type,
|
|
|
|
false) {
|
2014-06-05 16:37:52 -05:00
|
|
|
Failed(None) => {
|
2014-09-30 19:11:34 -05:00
|
|
|
let segment_name = token::get_name(name);
|
2014-06-21 05:39:03 -05:00
|
|
|
let module_name = self.module_to_string(&*search_module);
|
2014-06-05 16:37:52 -05:00
|
|
|
let mut span = span;
|
2015-02-18 13:48:57 -06:00
|
|
|
let msg = if "???" == &module_name[..] {
|
2015-02-03 17:48:39 -06:00
|
|
|
span.hi = span.lo + Pos::from_usize(segment_name.len());
|
2014-06-04 17:55:10 -05:00
|
|
|
|
2014-09-30 19:11:34 -05:00
|
|
|
match search_parent_externals(name,
|
2014-06-05 16:37:52 -05:00
|
|
|
&self.current_module) {
|
2014-06-04 17:55:10 -05:00
|
|
|
Some(module) => {
|
2014-09-30 19:11:34 -05:00
|
|
|
let path_str = self.names_to_string(module_path);
|
2014-06-21 05:39:03 -05:00
|
|
|
let target_mod_str = self.module_to_string(&*module);
|
2014-06-05 16:37:52 -05:00
|
|
|
let current_mod_str =
|
2014-06-21 05:39:03 -05:00
|
|
|
self.module_to_string(&*self.current_module);
|
2014-06-04 17:55:10 -05:00
|
|
|
|
|
|
|
let prefix = if target_mod_str == current_mod_str {
|
|
|
|
"self::".to_string()
|
|
|
|
} else {
|
|
|
|
format!("{}::", target_mod_str)
|
|
|
|
};
|
|
|
|
|
2014-06-05 16:37:52 -05:00
|
|
|
format!("Did you mean `{}{}`?", prefix, path_str)
|
2014-06-04 17:55:10 -05:00
|
|
|
},
|
2014-06-05 16:37:52 -05:00
|
|
|
None => format!("Maybe a missing `extern crate {}`?",
|
|
|
|
segment_name),
|
2014-06-04 17:55:10 -05:00
|
|
|
}
|
2014-06-05 16:37:52 -05:00
|
|
|
} else {
|
2014-11-28 00:01:41 -06:00
|
|
|
format!("Could not find `{}` in `{}`",
|
2014-06-05 16:37:52 -05:00
|
|
|
segment_name,
|
|
|
|
module_name)
|
|
|
|
};
|
2014-06-04 17:55:10 -05:00
|
|
|
|
2014-06-05 16:37:52 -05:00
|
|
|
return Failed(Some((span, msg)));
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2014-06-05 16:37:52 -05:00
|
|
|
Failed(err) => return Failed(err),
|
2012-08-03 21:59:04 -05:00
|
|
|
Indeterminate => {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving module path for import) module \
|
2013-09-28 00:38:08 -05:00
|
|
|
resolution is indeterminate: {}",
|
2014-09-30 19:11:34 -05:00
|
|
|
token::get_name(name));
|
2012-08-01 19:30:05 -05:00
|
|
|
return Indeterminate;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
Success((target, used_proxy)) => {
|
2012-10-15 20:04:15 -05:00
|
|
|
// Check to see whether there are type bindings, and, if
|
|
|
|
// so, whether there is a module within.
|
2014-03-28 12:29:55 -05:00
|
|
|
match *target.bindings.type_def.borrow() {
|
2014-04-14 03:30:59 -05:00
|
|
|
Some(ref type_def) => {
|
2012-10-15 20:04:15 -05:00
|
|
|
match type_def.module_def {
|
|
|
|
None => {
|
2014-06-05 16:37:52 -05:00
|
|
|
let msg = format!("Not a module `{}`",
|
2014-09-30 19:11:34 -05:00
|
|
|
token::get_name(name));
|
2014-06-05 16:37:52 -05:00
|
|
|
|
|
|
|
return Failed(Some((span, msg)));
|
2012-10-15 20:04:15 -05:00
|
|
|
}
|
2014-04-14 03:30:59 -05:00
|
|
|
Some(ref module_def) => {
|
2014-10-19 01:46:08 -05:00
|
|
|
search_module = module_def.clone();
|
|
|
|
|
|
|
|
// track extern crates for unused_extern_crate lint
|
2014-11-29 15:41:21 -06:00
|
|
|
if let Some(did) = module_def.def_id.get() {
|
|
|
|
self.used_crates.insert(did.krate);
|
2014-10-19 01:46:08 -05:00
|
|
|
}
|
2014-09-11 12:14:43 -05:00
|
|
|
|
2014-10-19 01:46:08 -05:00
|
|
|
// Keep track of the closest
|
|
|
|
// private module used when
|
|
|
|
// resolving this import chain.
|
2014-11-29 15:41:21 -06:00
|
|
|
if !used_proxy && !search_module.is_public {
|
|
|
|
if let Some(did) = search_module.def_id.get() {
|
|
|
|
closest_private = LastMod(DependsOn(did));
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
}
|
2013-05-13 18:13:20 -05:00
|
|
|
}
|
2012-10-15 20:04:15 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
None => {
|
|
|
|
// There are no type bindings at all.
|
2014-06-05 16:37:52 -05:00
|
|
|
let msg = format!("Not a module `{}`",
|
2014-09-30 19:11:34 -05:00
|
|
|
token::get_name(name));
|
2014-06-05 16:37:52 -05:00
|
|
|
return Failed(Some((span, msg)));
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-11-29 14:08:40 -06:00
|
|
|
index += 1;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
return Success((search_module, closest_private));
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2013-03-01 12:44:43 -06:00
|
|
|
/// Attempts to resolve the module part of an import directive or path
|
|
|
|
/// rooted at the given module.
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
///
|
|
|
|
/// On success, returns the resolved module, and the closest *private*
|
|
|
|
/// module found to the destination when resolving this path.
|
2013-10-02 07:33:01 -05:00
|
|
|
fn resolve_module_path(&mut self,
|
2014-04-14 03:30:59 -05:00
|
|
|
module_: Rc<Module>,
|
2014-09-30 19:11:34 -05:00
|
|
|
module_path: &[Name],
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
use_lexical_scope: UseLexicalScopeFlag,
|
|
|
|
span: Span,
|
|
|
|
name_search_type: NameSearchType)
|
2014-11-28 22:09:12 -06:00
|
|
|
-> ResolveResult<(Rc<Module>, LastPrivate)> {
|
2013-03-01 12:44:43 -06:00
|
|
|
let module_path_len = module_path.len();
|
2013-03-28 20:39:09 -05:00
|
|
|
assert!(module_path_len > 0);
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2014-12-04 13:58:52 -06:00
|
|
|
debug!("(resolving module path for import) processing `{}` rooted at `{}`",
|
2014-09-30 19:11:34 -05:00
|
|
|
self.names_to_string(module_path),
|
2014-06-21 05:39:03 -05:00
|
|
|
self.module_to_string(&*module_));
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2012-12-23 16:41:37 -06:00
|
|
|
// Resolve the module prefix, if any.
|
2014-04-14 03:30:59 -05:00
|
|
|
let module_prefix_result = self.resolve_module_prefix(module_.clone(),
|
2012-12-23 16:41:37 -06:00
|
|
|
module_path);
|
2012-12-13 15:05:22 -06:00
|
|
|
|
2013-04-12 00:15:30 -05:00
|
|
|
let search_module;
|
|
|
|
let start_index;
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
let last_private;
|
2012-12-23 16:41:37 -06:00
|
|
|
match module_prefix_result {
|
2014-06-05 16:37:52 -05:00
|
|
|
Failed(None) => {
|
2014-09-30 19:11:34 -05:00
|
|
|
let mpath = self.names_to_string(module_path);
|
2015-02-18 13:48:57 -06:00
|
|
|
let mpath = &mpath[..];
|
2014-06-05 16:37:52 -05:00
|
|
|
match mpath.rfind(':') {
|
2013-05-14 18:49:04 -05:00
|
|
|
Some(idx) => {
|
2014-06-05 16:37:52 -05:00
|
|
|
let msg = format!("Could not find `{}` in `{}`",
|
|
|
|
// idx +- 1 to account for the
|
|
|
|
// colons on either side
|
2015-01-19 10:07:13 -06:00
|
|
|
&mpath[idx + 1..],
|
|
|
|
&mpath[..idx - 1]);
|
2014-06-05 16:37:52 -05:00
|
|
|
return Failed(Some((span, msg)));
|
2013-05-14 18:49:04 -05:00
|
|
|
},
|
2014-11-28 22:09:12 -06:00
|
|
|
None => {
|
|
|
|
return Failed(None)
|
|
|
|
}
|
2014-06-05 16:37:52 -05:00
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2014-06-05 16:37:52 -05:00
|
|
|
Failed(err) => return Failed(err),
|
2012-08-03 21:59:04 -05:00
|
|
|
Indeterminate => {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving module path for import) indeterminate; \
|
2012-08-22 19:24:52 -05:00
|
|
|
bailing");
|
2012-08-01 19:30:05 -05:00
|
|
|
return Indeterminate;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2012-12-23 16:41:37 -06:00
|
|
|
Success(NoPrefixFound) => {
|
|
|
|
// There was no prefix, so we're considering the first element
|
|
|
|
// of the path. How we handle this depends on whether we were
|
|
|
|
// instructed to use lexical scope or not.
|
|
|
|
match use_lexical_scope {
|
|
|
|
DontUseLexicalScope => {
|
|
|
|
// This is a crate-relative path. We will start the
|
|
|
|
// resolution process at index zero.
|
|
|
|
search_module = self.graph_root.get_module();
|
|
|
|
start_index = 0;
|
2014-02-11 13:19:18 -06:00
|
|
|
last_private = LastMod(AllPublic);
|
2012-12-23 16:41:37 -06:00
|
|
|
}
|
|
|
|
UseLexicalScope => {
|
|
|
|
// This is not a crate-relative path. We resolve the
|
|
|
|
// first component of the path in the current lexical
|
|
|
|
// scope and then proceed to resolve below that.
|
2014-11-28 22:08:30 -06:00
|
|
|
match self.resolve_module_in_lexical_scope(module_,
|
|
|
|
module_path[0]) {
|
2014-06-05 16:37:52 -05:00
|
|
|
Failed(err) => return Failed(err),
|
2012-12-23 16:41:37 -06:00
|
|
|
Indeterminate => {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving module path for import) \
|
2012-12-23 16:41:37 -06:00
|
|
|
indeterminate; bailing");
|
|
|
|
return Indeterminate;
|
|
|
|
}
|
|
|
|
Success(containing_module) => {
|
|
|
|
search_module = containing_module;
|
|
|
|
start_index = 1;
|
2014-02-11 13:19:18 -06:00
|
|
|
last_private = LastMod(AllPublic);
|
2012-12-23 16:41:37 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-04-14 03:30:59 -05:00
|
|
|
Success(PrefixFound(ref containing_module, index)) => {
|
|
|
|
search_module = containing_module.clone();
|
2012-12-23 16:41:37 -06:00
|
|
|
start_index = index;
|
2014-02-11 13:19:18 -06:00
|
|
|
last_private = LastMod(DependsOn(containing_module.def_id
|
|
|
|
.get()
|
|
|
|
.unwrap()));
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-01 12:44:43 -06:00
|
|
|
self.resolve_module_path_from_root(search_module,
|
|
|
|
module_path,
|
|
|
|
start_index,
|
|
|
|
span,
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
name_search_type,
|
|
|
|
last_private)
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2013-03-01 12:44:43 -06:00
|
|
|
/// Invariant: This must only be called during main resolution, not during
|
|
|
|
/// import resolution.
|
2013-10-02 07:33:01 -05:00
|
|
|
fn resolve_item_in_lexical_scope(&mut self,
|
2014-04-14 03:30:59 -05:00
|
|
|
module_: Rc<Module>,
|
2014-09-30 19:11:34 -05:00
|
|
|
name: Name,
|
2014-05-16 17:44:14 -05:00
|
|
|
namespace: Namespace)
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
-> ResolveResult<(Target, bool)> {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving item in lexical scope) resolving `{}` in \
|
2014-12-20 02:09:35 -06:00
|
|
|
namespace {:?} in `{}`",
|
2014-09-30 19:11:34 -05:00
|
|
|
token::get_name(name),
|
2012-05-22 12:54:12 -05:00
|
|
|
namespace,
|
2014-06-21 05:39:03 -05:00
|
|
|
self.module_to_string(&*module_));
|
2012-05-22 12:54:12 -05:00
|
|
|
|
|
|
|
// The current module node is handled specially. First, check for
|
|
|
|
// its immediate children.
|
2014-12-30 12:16:42 -06:00
|
|
|
build_reduced_graph::populate_module_if_necessary(self, &module_);
|
2013-12-21 17:32:44 -06:00
|
|
|
|
2014-11-06 11:25:16 -06:00
|
|
|
match module_.children.borrow().get(&name) {
|
2014-03-20 21:49:20 -05:00
|
|
|
Some(name_bindings)
|
|
|
|
if name_bindings.defined_in_namespace(namespace) => {
|
|
|
|
debug!("top name bindings succeeded");
|
2014-08-12 22:31:30 -05:00
|
|
|
return Success((Target::new(module_.clone(),
|
|
|
|
name_bindings.clone(),
|
2014-11-23 03:29:41 -06:00
|
|
|
Shadowable::Never),
|
2014-03-20 21:49:20 -05:00
|
|
|
false));
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2014-03-20 21:49:20 -05:00
|
|
|
Some(_) | None => { /* Not found; continue. */ }
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// Now check for its import directives. We don't have to have resolved
|
|
|
|
// all its imports in the usual way; this is because chains of
|
|
|
|
// adjacent import statements are processed as though they mutated the
|
|
|
|
// current scope.
|
2014-11-29 15:41:21 -06:00
|
|
|
if let Some(import_resolution) = module_.import_resolutions.borrow().get(&name) {
|
|
|
|
match (*import_resolution).target_for_namespace(namespace) {
|
|
|
|
None => {
|
|
|
|
// Not found; continue.
|
|
|
|
debug!("(resolving item in lexical scope) found \
|
2014-12-20 02:09:35 -06:00
|
|
|
import resolution, but not in namespace {:?}",
|
2014-11-29 15:41:21 -06:00
|
|
|
namespace);
|
|
|
|
}
|
|
|
|
Some(target) => {
|
|
|
|
debug!("(resolving item in lexical scope) using \
|
|
|
|
import resolution");
|
|
|
|
// track used imports and extern crates as well
|
2014-11-23 03:29:41 -06:00
|
|
|
let id = import_resolution.id(namespace);
|
|
|
|
self.used_imports.insert((id, namespace));
|
|
|
|
self.record_import_use(id, name);
|
2014-11-29 15:41:21 -06:00
|
|
|
if let Some(DefId{krate: kid, ..}) = target.target_module.def_id.get() {
|
2014-11-23 03:29:41 -06:00
|
|
|
self.used_crates.insert(kid);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2014-11-29 15:41:21 -06:00
|
|
|
return Success((target, false));
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-26 21:53:33 -05:00
|
|
|
// Search for external modules.
|
|
|
|
if namespace == TypeNS {
|
2015-01-12 10:23:40 -06:00
|
|
|
// FIXME (21114): In principle unclear `child` *has* to be lifted.
|
|
|
|
let child = module_.external_module_children.borrow().get(&name).cloned();
|
|
|
|
if let Some(module) = child {
|
2014-11-29 15:41:21 -06:00
|
|
|
let name_bindings =
|
|
|
|
Rc::new(Resolver::create_name_bindings_from_module(module));
|
|
|
|
debug!("lower name bindings succeeded");
|
2014-11-23 03:29:41 -06:00
|
|
|
return Success((Target::new(module_,
|
|
|
|
name_bindings,
|
|
|
|
Shadowable::Never),
|
2014-11-29 15:41:21 -06:00
|
|
|
false));
|
2013-03-26 21:53:33 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-05-22 12:54:12 -05:00
|
|
|
// Finally, proceed up the scope chain looking for parent modules.
|
2012-07-31 18:38:41 -05:00
|
|
|
let mut search_module = module_;
|
2012-05-22 12:54:12 -05:00
|
|
|
loop {
|
|
|
|
// Go to the next parent.
|
2014-04-14 03:30:59 -05:00
|
|
|
match search_module.parent_link.clone() {
|
2012-08-03 21:59:04 -05:00
|
|
|
NoParentLink => {
|
2012-05-22 12:54:12 -05:00
|
|
|
// No more parents. This module was unresolved.
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving item in lexical scope) unresolved \
|
2012-08-22 19:24:52 -05:00
|
|
|
module");
|
2014-06-05 16:37:52 -05:00
|
|
|
return Failed(None);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2012-12-23 16:41:37 -06:00
|
|
|
ModuleParentLink(parent_module_node, _) => {
|
2014-05-16 17:44:14 -05:00
|
|
|
match search_module.kind.get() {
|
|
|
|
NormalModuleKind => {
|
|
|
|
// We stop the search here.
|
|
|
|
debug!("(resolving item in lexical \
|
|
|
|
scope) unresolved module: not \
|
|
|
|
searching through module \
|
|
|
|
parents");
|
2014-06-05 16:37:52 -05:00
|
|
|
return Failed(None);
|
2012-12-23 16:41:37 -06:00
|
|
|
}
|
2014-05-16 17:44:14 -05:00
|
|
|
TraitModuleKind |
|
2014-10-19 01:46:08 -05:00
|
|
|
EnumModuleKind |
|
2015-01-16 16:25:45 -06:00
|
|
|
TypeModuleKind |
|
2014-05-16 17:44:14 -05:00
|
|
|
AnonymousModuleKind => {
|
2014-04-14 03:30:59 -05:00
|
|
|
search_module = parent_module_node.upgrade().unwrap();
|
2012-12-23 16:41:37 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-04-14 03:30:59 -05:00
|
|
|
BlockParentLink(ref parent_module_node, _) => {
|
|
|
|
search_module = parent_module_node.upgrade().unwrap();
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Resolve the name in the parent module.
|
2014-04-14 03:30:59 -05:00
|
|
|
match self.resolve_name_in_module(search_module.clone(),
|
2014-09-30 19:11:34 -05:00
|
|
|
name,
|
2012-12-13 15:05:22 -06:00
|
|
|
namespace,
|
2014-04-08 16:31:25 -05:00
|
|
|
PathSearch,
|
|
|
|
true) {
|
2014-06-05 16:37:52 -05:00
|
|
|
Failed(Some((span, msg))) =>
|
2015-01-07 10:58:31 -06:00
|
|
|
self.resolve_error(span, &format!("failed to resolve. {}",
|
2015-02-20 13:08:14 -06:00
|
|
|
msg)),
|
2014-06-05 16:37:52 -05:00
|
|
|
Failed(None) => (), // Continue up the search chain.
|
2012-08-03 21:59:04 -05:00
|
|
|
Indeterminate => {
|
2012-05-22 12:54:12 -05:00
|
|
|
// We couldn't see through the higher scope because of an
|
|
|
|
// unresolved import higher up. Bail.
|
|
|
|
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving item in lexical scope) indeterminate \
|
2012-08-22 19:24:52 -05:00
|
|
|
higher scope; bailing");
|
2012-08-01 19:30:05 -05:00
|
|
|
return Indeterminate;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
Success((target, used_reexport)) => {
|
2012-05-22 12:54:12 -05:00
|
|
|
// We found the module.
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving item in lexical scope) found name \
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
in module, done");
|
|
|
|
return Success((target, used_reexport));
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-31 17:17:22 -05:00
|
|
|
/// Resolves a module name in the current lexical scope.
|
2013-10-02 07:33:01 -05:00
|
|
|
fn resolve_module_in_lexical_scope(&mut self,
|
2014-04-14 03:30:59 -05:00
|
|
|
module_: Rc<Module>,
|
2014-09-30 19:11:34 -05:00
|
|
|
name: Name)
|
2014-04-14 03:30:59 -05:00
|
|
|
-> ResolveResult<Rc<Module>> {
|
2012-12-13 15:05:22 -06:00
|
|
|
// If this module is an anonymous module, resolve the item in the
|
|
|
|
// lexical scope. Otherwise, resolve the item from the crate root.
|
2014-11-28 22:09:12 -06:00
|
|
|
let resolve_result = self.resolve_item_in_lexical_scope(module_, name, TypeNS);
|
2012-12-13 15:05:22 -06:00
|
|
|
match resolve_result {
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
Success((target, _)) => {
|
2013-12-21 16:20:57 -06:00
|
|
|
let bindings = &*target.bindings;
|
2014-03-28 12:29:55 -05:00
|
|
|
match *bindings.type_def.borrow() {
|
2014-04-14 03:30:59 -05:00
|
|
|
Some(ref type_def) => {
|
2013-12-21 16:13:06 -06:00
|
|
|
match type_def.module_def {
|
2012-10-15 20:04:15 -05:00
|
|
|
None => {
|
2014-05-15 17:52:58 -05:00
|
|
|
debug!("!!! (resolving module in lexical \
|
2012-10-15 20:04:15 -05:00
|
|
|
scope) module wasn't actually a \
|
|
|
|
module!");
|
2014-06-05 16:37:52 -05:00
|
|
|
return Failed(None);
|
2012-10-15 20:04:15 -05:00
|
|
|
}
|
2014-04-14 03:30:59 -05:00
|
|
|
Some(ref module_def) => {
|
|
|
|
return Success(module_def.clone());
|
2012-10-15 20:04:15 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
None => {
|
2014-05-15 17:52:58 -05:00
|
|
|
debug!("!!! (resolving module in lexical scope) module
|
2012-08-22 19:24:52 -05:00
|
|
|
wasn't actually a module!");
|
2014-06-05 16:37:52 -05:00
|
|
|
return Failed(None);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-08-03 21:59:04 -05:00
|
|
|
Indeterminate => {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving module in lexical scope) indeterminate; \
|
2012-08-22 19:24:52 -05:00
|
|
|
bailing");
|
2012-08-01 19:30:05 -05:00
|
|
|
return Indeterminate;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2014-06-05 16:37:52 -05:00
|
|
|
Failed(err) => {
|
|
|
|
debug!("(resolving module in lexical scope) failed to resolve");
|
|
|
|
return Failed(err);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-31 17:17:22 -05:00
|
|
|
/// Returns the nearest normal module parent of the given module.
|
2014-04-14 03:30:59 -05:00
|
|
|
fn get_nearest_normal_module_parent(&mut self, module_: Rc<Module>)
|
|
|
|
-> Option<Rc<Module>> {
|
2012-12-23 16:41:37 -06:00
|
|
|
let mut module_ = module_;
|
|
|
|
loop {
|
2014-04-14 03:30:59 -05:00
|
|
|
match module_.parent_link.clone() {
|
2012-12-23 16:41:37 -06:00
|
|
|
NoParentLink => return None,
|
|
|
|
ModuleParentLink(new_module, _) |
|
|
|
|
BlockParentLink(new_module, _) => {
|
2014-04-14 03:30:59 -05:00
|
|
|
let new_module = new_module.upgrade().unwrap();
|
2013-12-19 20:52:35 -06:00
|
|
|
match new_module.kind.get() {
|
2012-12-23 16:41:37 -06:00
|
|
|
NormalModuleKind => return Some(new_module),
|
|
|
|
TraitModuleKind |
|
2014-10-19 01:46:08 -05:00
|
|
|
EnumModuleKind |
|
2015-01-16 16:25:45 -06:00
|
|
|
TypeModuleKind |
|
2012-12-23 16:41:37 -06:00
|
|
|
AnonymousModuleKind => module_ = new_module,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-31 17:17:22 -05:00
|
|
|
/// Returns the nearest normal module parent of the given module, or the
|
|
|
|
/// module itself if it is a normal module.
|
2014-04-14 03:30:59 -05:00
|
|
|
fn get_nearest_normal_module_parent_or_self(&mut self, module_: Rc<Module>)
|
|
|
|
-> Rc<Module> {
|
2013-12-19 20:52:35 -06:00
|
|
|
match module_.kind.get() {
|
2012-12-23 16:41:37 -06:00
|
|
|
NormalModuleKind => return module_,
|
2013-05-13 18:13:20 -05:00
|
|
|
TraitModuleKind |
|
2014-10-19 01:46:08 -05:00
|
|
|
EnumModuleKind |
|
2015-01-16 16:25:45 -06:00
|
|
|
TypeModuleKind |
|
2013-05-13 18:13:20 -05:00
|
|
|
AnonymousModuleKind => {
|
2014-04-14 03:30:59 -05:00
|
|
|
match self.get_nearest_normal_module_parent(module_.clone()) {
|
2012-12-23 16:41:37 -06:00
|
|
|
None => module_,
|
|
|
|
Some(new_module) => new_module
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-26 17:56:13 -05:00
|
|
|
/// Resolves a "module prefix". A module prefix is one or both of (a) `self::`;
|
2013-05-31 17:17:22 -05:00
|
|
|
/// (b) some chain of `super::`.
|
2013-06-26 17:56:13 -05:00
|
|
|
/// grammar: (SELF MOD_SEP ) ? (SUPER MOD_SEP) *
|
2013-10-02 07:33:01 -05:00
|
|
|
fn resolve_module_prefix(&mut self,
|
2014-04-14 03:30:59 -05:00
|
|
|
module_: Rc<Module>,
|
2014-09-30 19:11:34 -05:00
|
|
|
module_path: &[Name])
|
2013-05-31 17:17:22 -05:00
|
|
|
-> ResolveResult<ModulePrefixResult> {
|
2012-12-23 16:41:37 -06:00
|
|
|
// Start at the current module if we see `self` or `super`, or at the
|
|
|
|
// top of the crate otherwise.
|
|
|
|
let mut containing_module;
|
|
|
|
let mut i;
|
2014-09-30 19:11:34 -05:00
|
|
|
let first_module_path_string = token::get_name(module_path[0]);
|
2015-02-18 13:48:57 -06:00
|
|
|
if "self" == &first_module_path_string[..] {
|
2012-12-23 16:41:37 -06:00
|
|
|
containing_module =
|
|
|
|
self.get_nearest_normal_module_parent_or_self(module_);
|
|
|
|
i = 1;
|
2015-02-18 13:48:57 -06:00
|
|
|
} else if "super" == &first_module_path_string[..] {
|
2012-12-23 16:41:37 -06:00
|
|
|
containing_module =
|
|
|
|
self.get_nearest_normal_module_parent_or_self(module_);
|
|
|
|
i = 0; // We'll handle `super` below.
|
|
|
|
} else {
|
|
|
|
return Success(NoPrefixFound);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Now loop through all the `super`s we find.
|
2014-01-31 15:48:49 -06:00
|
|
|
while i < module_path.len() {
|
2014-09-30 19:11:34 -05:00
|
|
|
let string = token::get_name(module_path[i]);
|
2015-02-18 13:48:57 -06:00
|
|
|
if "super" != &string[..] {
|
2014-01-31 15:48:49 -06:00
|
|
|
break
|
|
|
|
}
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving module prefix) resolving `super` at {}",
|
2014-06-21 05:39:03 -05:00
|
|
|
self.module_to_string(&*containing_module));
|
2012-12-23 16:41:37 -06:00
|
|
|
match self.get_nearest_normal_module_parent(containing_module) {
|
2014-06-05 16:37:52 -05:00
|
|
|
None => return Failed(None),
|
2012-12-23 16:41:37 -06:00
|
|
|
Some(new_module) => {
|
|
|
|
containing_module = new_module;
|
|
|
|
i += 1;
|
2012-12-13 15:05:22 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving module prefix) finished resolving prefix at {}",
|
2014-06-21 05:39:03 -05:00
|
|
|
self.module_to_string(&*containing_module));
|
2012-12-23 16:41:37 -06:00
|
|
|
|
|
|
|
return Success(PrefixFound(containing_module, i));
|
2012-12-13 15:05:22 -06:00
|
|
|
}
|
|
|
|
|
2013-03-01 12:44:43 -06:00
|
|
|
/// Attempts to resolve the supplied name in the given module for the
|
|
|
|
/// given namespace. If successful, returns the target corresponding to
|
|
|
|
/// the name.
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
///
|
|
|
|
/// The boolean returned on success is an indicator of whether this lookup
|
|
|
|
/// passed through a public re-export proxy.
|
2013-10-02 07:33:01 -05:00
|
|
|
fn resolve_name_in_module(&mut self,
|
2014-04-14 03:30:59 -05:00
|
|
|
module_: Rc<Module>,
|
2014-05-08 16:35:09 -05:00
|
|
|
name: Name,
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
namespace: Namespace,
|
2014-04-08 16:31:25 -05:00
|
|
|
name_search_type: NameSearchType,
|
|
|
|
allow_private_imports: bool)
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
-> ResolveResult<(Target, bool)> {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving name in module) resolving `{}` in `{}`",
|
2015-02-04 14:48:12 -06:00
|
|
|
&token::get_name(name),
|
2014-06-21 05:39:03 -05:00
|
|
|
self.module_to_string(&*module_));
|
2012-05-22 12:54:12 -05:00
|
|
|
|
|
|
|
// First, check the direct children of the module.
|
2014-12-30 12:16:42 -06:00
|
|
|
build_reduced_graph::populate_module_if_necessary(self, &module_);
|
2013-12-21 17:32:44 -06:00
|
|
|
|
2014-11-06 11:25:16 -06:00
|
|
|
match module_.children.borrow().get(&name) {
|
2014-03-20 21:49:20 -05:00
|
|
|
Some(name_bindings)
|
|
|
|
if name_bindings.defined_in_namespace(namespace) => {
|
|
|
|
debug!("(resolving name in module) found node as child");
|
2014-08-12 22:31:30 -05:00
|
|
|
return Success((Target::new(module_.clone(),
|
|
|
|
name_bindings.clone(),
|
2014-11-23 03:29:41 -06:00
|
|
|
Shadowable::Never),
|
2014-03-20 21:49:20 -05:00
|
|
|
false));
|
|
|
|
}
|
|
|
|
Some(_) | None => {
|
|
|
|
// Continue.
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-01 12:44:43 -06:00
|
|
|
// Next, check the module's imports if necessary.
|
|
|
|
|
|
|
|
// If this is a search of all imports, we should be done with glob
|
|
|
|
// resolution at this point.
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
if name_search_type == PathSearch {
|
2013-12-19 20:59:03 -06:00
|
|
|
assert_eq!(module_.glob_count.get(), 0);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2013-03-01 12:44:43 -06:00
|
|
|
// Check the list of resolved imports.
|
2014-11-06 11:25:16 -06:00
|
|
|
match module_.import_resolutions.borrow().get(&name) {
|
2014-04-08 16:31:25 -05:00
|
|
|
Some(import_resolution) if allow_private_imports ||
|
2014-04-14 03:30:59 -05:00
|
|
|
import_resolution.is_public => {
|
2014-04-08 16:31:25 -05:00
|
|
|
|
2014-04-14 03:30:59 -05:00
|
|
|
if import_resolution.is_public &&
|
|
|
|
import_resolution.outstanding_references != 0 {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving name in module) import \
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
unresolved; bailing out");
|
2012-08-01 19:30:05 -05:00
|
|
|
return Indeterminate;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2013-03-01 12:44:43 -06:00
|
|
|
match import_resolution.target_for_namespace(namespace) {
|
2012-08-20 14:23:37 -05:00
|
|
|
None => {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving name in module) name found, \
|
2014-12-20 02:09:35 -06:00
|
|
|
but not in namespace {:?}",
|
2012-08-22 19:24:52 -05:00
|
|
|
namespace);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
Some(target) => {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving name in module) resolved to \
|
2012-08-22 19:24:52 -05:00
|
|
|
import");
|
2014-09-11 12:14:43 -05:00
|
|
|
// track used imports and extern crates as well
|
2014-11-23 03:29:41 -06:00
|
|
|
let id = import_resolution.id(namespace);
|
|
|
|
self.used_imports.insert((id, namespace));
|
|
|
|
self.record_import_use(id, name);
|
2014-11-29 15:41:21 -06:00
|
|
|
if let Some(DefId{krate: kid, ..}) = target.target_module.def_id.get() {
|
|
|
|
self.used_crates.insert(kid);
|
2014-09-11 12:14:43 -05:00
|
|
|
}
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
return Success((target, true));
|
2013-03-01 12:44:43 -06:00
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
2014-04-08 16:31:25 -05:00
|
|
|
Some(..) | None => {} // Continue.
|
2013-03-26 21:53:33 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// Finally, search through external children.
|
|
|
|
if namespace == TypeNS {
|
2015-01-12 10:23:40 -06:00
|
|
|
// FIXME (21114): In principle unclear `child` *has* to be lifted.
|
|
|
|
let child = module_.external_module_children.borrow().get(&name).cloned();
|
|
|
|
if let Some(module) = child {
|
2014-11-29 15:41:21 -06:00
|
|
|
let name_bindings =
|
|
|
|
Rc::new(Resolver::create_name_bindings_from_module(module));
|
2014-11-23 03:29:41 -06:00
|
|
|
return Success((Target::new(module_,
|
|
|
|
name_bindings,
|
|
|
|
Shadowable::Never),
|
2014-11-29 15:41:21 -06:00
|
|
|
false));
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// We're out of luck.
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving name in module) failed to resolve `{}`",
|
2015-02-04 14:48:12 -06:00
|
|
|
&token::get_name(name));
|
2014-06-05 16:37:52 -05:00
|
|
|
return Failed(None);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2014-04-14 03:30:59 -05:00
|
|
|
fn report_unresolved_imports(&mut self, module_: Rc<Module>) {
|
2013-12-19 21:01:02 -06:00
|
|
|
let index = module_.resolved_import_count.get();
|
2014-03-20 21:49:20 -05:00
|
|
|
let imports = module_.imports.borrow();
|
|
|
|
let import_count = imports.len();
|
2012-05-22 12:54:12 -05:00
|
|
|
if index != import_count {
|
2013-12-22 18:39:46 -06:00
|
|
|
let sn = self.session
|
2014-03-16 13:56:24 -05:00
|
|
|
.codemap()
|
2014-10-15 01:05:01 -05:00
|
|
|
.span_to_snippet((*imports)[index].span)
|
2013-12-22 18:39:46 -06:00
|
|
|
.unwrap();
|
2014-11-27 12:53:34 -06:00
|
|
|
if sn.contains("::") {
|
2014-10-15 01:05:01 -05:00
|
|
|
self.resolve_error((*imports)[index].span,
|
2013-12-22 18:39:46 -06:00
|
|
|
"unresolved import");
|
2013-04-26 03:59:28 -05:00
|
|
|
} else {
|
2013-09-28 00:38:08 -05:00
|
|
|
let err = format!("unresolved import (maybe you meant `{}::*`?)",
|
2014-12-10 21:46:38 -06:00
|
|
|
sn);
|
2015-02-18 13:48:57 -06:00
|
|
|
self.resolve_error((*imports)[index].span, &err[..]);
|
2013-04-26 03:59:28 -05:00
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// Descend into children and anonymous children.
|
2014-12-30 12:16:42 -06:00
|
|
|
build_reduced_graph::populate_module_if_necessary(self, &module_);
|
2013-12-21 17:32:44 -06:00
|
|
|
|
2015-01-31 11:20:46 -06:00
|
|
|
for (_, child_node) in &*module_.children.borrow() {
|
2014-03-20 21:49:20 -05:00
|
|
|
match child_node.get_module_if_available() {
|
|
|
|
None => {
|
|
|
|
// Continue.
|
|
|
|
}
|
|
|
|
Some(child_module) => {
|
|
|
|
self.report_unresolved_imports(child_module);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-31 11:20:46 -06:00
|
|
|
for (_, module_) in &*module_.anonymous_children.borrow() {
|
2014-04-14 03:30:59 -05:00
|
|
|
self.report_unresolved_imports(module_.clone());
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// AST resolution
|
|
|
|
//
|
2012-07-06 21:06:58 -05:00
|
|
|
// We maintain a list of value ribs and type ribs.
|
2012-05-22 12:54:12 -05:00
|
|
|
//
|
|
|
|
// Simultaneously, we keep track of the current position in the module
|
|
|
|
// graph in the `current_module` pointer. When we go to resolve a name in
|
|
|
|
// the value or type namespaces, we first look through all the ribs and
|
|
|
|
// then query the module graph. When we resolve a name in the module
|
|
|
|
// namespace, we can skip all the ribs (since nested modules are not
|
|
|
|
// allowed within blocks in Rust) and jump straight to the current module
|
|
|
|
// graph node.
|
|
|
|
//
|
|
|
|
// Named implementations are handled separately. When we find a method
|
|
|
|
// call, we consult the module node to find all of the implementations in
|
|
|
|
// scope. This information is lazily cached in the module node. We then
|
|
|
|
// generate a fake "implementation scope" containing all the
|
|
|
|
// implementations thus found, for compatibility with old resolve pass.
|
|
|
|
|
2014-12-08 19:26:43 -06:00
|
|
|
fn with_scope<F>(&mut self, name: Option<Name>, f: F) where
|
|
|
|
F: FnOnce(&mut Resolver),
|
|
|
|
{
|
2014-04-14 03:30:59 -05:00
|
|
|
let orig_module = self.current_module.clone();
|
2012-05-22 12:54:12 -05:00
|
|
|
|
|
|
|
// Move down in the graph.
|
2012-08-06 14:34:08 -05:00
|
|
|
match name {
|
2012-08-20 14:23:37 -05:00
|
|
|
None => {
|
2012-07-11 17:00:40 -05:00
|
|
|
// Nothing to do.
|
|
|
|
}
|
2012-08-20 14:23:37 -05:00
|
|
|
Some(name) => {
|
2014-12-30 12:16:42 -06:00
|
|
|
build_reduced_graph::populate_module_if_necessary(self, &orig_module);
|
2013-12-21 17:32:44 -06:00
|
|
|
|
2014-11-06 11:25:16 -06:00
|
|
|
match orig_module.children.borrow().get(&name) {
|
2012-08-20 14:23:37 -05:00
|
|
|
None => {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("!!! (with scope) didn't find `{}` in `{}`",
|
2014-09-30 19:11:34 -05:00
|
|
|
token::get_name(name),
|
2014-06-21 05:39:03 -05:00
|
|
|
self.module_to_string(&*orig_module));
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2012-08-20 14:23:37 -05:00
|
|
|
Some(name_bindings) => {
|
2012-08-06 14:34:08 -05:00
|
|
|
match (*name_bindings).get_module_if_available() {
|
2012-08-20 14:23:37 -05:00
|
|
|
None => {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("!!! (with scope) didn't find module \
|
2013-09-28 00:38:08 -05:00
|
|
|
for `{}` in `{}`",
|
2014-09-30 19:11:34 -05:00
|
|
|
token::get_name(name),
|
2014-06-21 05:39:03 -05:00
|
|
|
self.module_to_string(&*orig_module));
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2012-08-20 14:23:37 -05:00
|
|
|
Some(module_) => {
|
2012-07-31 18:38:41 -05:00
|
|
|
self.current_module = module_;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-09-26 21:10:16 -05:00
|
|
|
f(self);
|
2012-05-22 12:54:12 -05:00
|
|
|
|
|
|
|
self.current_module = orig_module;
|
|
|
|
}
|
|
|
|
|
2014-09-17 21:45:21 -05:00
|
|
|
/// Wraps the given definition in the appropriate number of `DefUpvar`
|
2013-05-31 17:17:22 -05:00
|
|
|
/// wrappers.
|
2014-04-22 11:06:43 -05:00
|
|
|
fn upvarify(&self,
|
2014-04-14 03:30:59 -05:00
|
|
|
ribs: &[Rib],
|
2014-04-22 11:06:43 -05:00
|
|
|
def_like: DefLike,
|
|
|
|
span: Span)
|
|
|
|
-> Option<DefLike> {
|
2015-02-05 01:19:07 -06:00
|
|
|
let mut def = match def_like {
|
|
|
|
DlDef(def) => def,
|
|
|
|
_ => return Some(def_like)
|
|
|
|
};
|
|
|
|
match def {
|
|
|
|
DefUpvar(..) => {
|
2014-09-17 21:45:21 -05:00
|
|
|
self.session.span_bug(span,
|
2015-02-05 01:19:07 -06:00
|
|
|
&format!("unexpected {:?} in bindings", def))
|
2014-09-17 21:45:21 -05:00
|
|
|
}
|
2015-02-05 01:19:07 -06:00
|
|
|
DefLocal(node_id) => {
|
2015-01-31 11:20:46 -06:00
|
|
|
for rib in ribs {
|
2014-09-17 21:45:21 -05:00
|
|
|
match rib.kind {
|
|
|
|
NormalRibKind => {
|
|
|
|
// Nothing to do. Continue.
|
|
|
|
}
|
2015-01-24 14:04:41 -06:00
|
|
|
ClosureRibKind(function_id) => {
|
2014-09-17 21:45:21 -05:00
|
|
|
let prev_def = def;
|
2015-01-24 14:04:41 -06:00
|
|
|
def = DefUpvar(node_id, function_id);
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2014-09-17 21:45:21 -05:00
|
|
|
let mut seen = self.freevars_seen.borrow_mut();
|
2015-01-06 10:36:30 -06:00
|
|
|
let seen = match seen.entry(function_id) {
|
2014-10-15 01:05:01 -05:00
|
|
|
Occupied(v) => v.into_mut(),
|
2015-01-16 16:27:43 -06:00
|
|
|
Vacant(v) => v.insert(NodeSet()),
|
2014-10-15 01:05:01 -05:00
|
|
|
};
|
2014-09-17 21:45:21 -05:00
|
|
|
if seen.contains(&node_id) {
|
|
|
|
continue;
|
|
|
|
}
|
2015-01-06 10:36:30 -06:00
|
|
|
match self.freevars.borrow_mut().entry(function_id) {
|
2014-10-15 01:05:01 -05:00
|
|
|
Occupied(v) => v.into_mut(),
|
2015-01-04 13:07:32 -06:00
|
|
|
Vacant(v) => v.insert(vec![]),
|
2014-10-15 01:05:01 -05:00
|
|
|
}.push(Freevar { def: prev_def, span: span });
|
2014-09-17 21:45:21 -05:00
|
|
|
seen.insert(node_id);
|
|
|
|
}
|
2015-02-05 01:19:07 -06:00
|
|
|
ItemRibKind | MethodRibKind => {
|
2014-09-17 21:45:21 -05:00
|
|
|
// This was an attempt to access an upvar inside a
|
|
|
|
// named function item. This is not allowed, so we
|
|
|
|
// report an error.
|
2012-07-26 16:04:03 -05:00
|
|
|
|
2015-02-05 01:19:07 -06:00
|
|
|
self.resolve_error(span,
|
2014-09-17 21:45:21 -05:00
|
|
|
"can't capture dynamic environment in a fn item; \
|
2015-02-05 01:19:07 -06:00
|
|
|
use the || { ... } closure form instead");
|
2014-09-17 21:45:21 -05:00
|
|
|
return None;
|
|
|
|
}
|
|
|
|
ConstantItemRibKind => {
|
|
|
|
// Still doesn't deal with upvars
|
|
|
|
self.resolve_error(span,
|
|
|
|
"attempt to use a non-constant \
|
|
|
|
value in a constant");
|
2015-02-05 01:19:07 -06:00
|
|
|
return None;
|
2014-09-17 21:45:21 -05:00
|
|
|
}
|
2012-07-26 16:04:03 -05:00
|
|
|
}
|
|
|
|
}
|
2014-09-17 21:45:21 -05:00
|
|
|
}
|
2015-02-05 01:19:07 -06:00
|
|
|
DefTyParam(..) | DefSelfTy(_) => {
|
2015-01-31 11:20:46 -06:00
|
|
|
for rib in ribs {
|
2014-09-17 21:45:21 -05:00
|
|
|
match rib.kind {
|
2015-02-05 01:19:07 -06:00
|
|
|
NormalRibKind | MethodRibKind | ClosureRibKind(..) => {
|
2014-09-17 21:45:21 -05:00
|
|
|
// Nothing to do. Continue.
|
|
|
|
}
|
|
|
|
ItemRibKind => {
|
|
|
|
// This was an attempt to use a type parameter outside
|
|
|
|
// its scope.
|
2012-10-15 14:27:09 -05:00
|
|
|
|
2014-09-17 21:45:21 -05:00
|
|
|
self.resolve_error(span,
|
|
|
|
"can't use type parameters from \
|
|
|
|
outer function; try using a local \
|
|
|
|
type parameter instead");
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
ConstantItemRibKind => {
|
|
|
|
// see #9186
|
|
|
|
self.resolve_error(span,
|
|
|
|
"cannot use an outer type \
|
|
|
|
parameter in this context");
|
2015-02-05 01:19:07 -06:00
|
|
|
return None;
|
2014-09-17 21:45:21 -05:00
|
|
|
}
|
|
|
|
}
|
2012-10-15 14:27:09 -05:00
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2015-02-05 01:19:07 -06:00
|
|
|
_ => {}
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2015-02-05 01:19:07 -06:00
|
|
|
Some(DlDef(def))
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2014-12-27 06:47:42 -06:00
|
|
|
/// Searches the current set of local scopes and
|
|
|
|
/// applies translations for closures.
|
2014-04-22 11:06:43 -05:00
|
|
|
fn search_ribs(&self,
|
2014-04-14 03:30:59 -05:00
|
|
|
ribs: &[Rib],
|
2014-04-22 11:06:43 -05:00
|
|
|
name: Name,
|
|
|
|
span: Span)
|
|
|
|
-> Option<DefLike> {
|
2013-02-14 20:37:25 -06:00
|
|
|
// FIXME #4950: Try caching?
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2014-09-17 21:45:21 -05:00
|
|
|
for (i, rib) in ribs.iter().enumerate().rev() {
|
2015-02-05 01:19:07 -06:00
|
|
|
if let Some(def_like) = rib.bindings.get(&name).cloned() {
|
|
|
|
return self.upvarify(&ribs[i + 1..], def_like, span);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-09-17 21:45:21 -05:00
|
|
|
None
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2014-12-27 06:47:42 -06:00
|
|
|
/// Searches the current set of local scopes for labels.
|
|
|
|
/// Stops after meeting a closure.
|
2014-12-26 05:08:00 -06:00
|
|
|
fn search_label(&self, name: Name) -> Option<DefLike> {
|
|
|
|
for rib in self.label_ribs.iter().rev() {
|
|
|
|
match rib.kind {
|
|
|
|
NormalRibKind => {
|
|
|
|
// Continue
|
|
|
|
}
|
|
|
|
_ => {
|
|
|
|
// Do not resolve labels across function boundary
|
|
|
|
return None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
let result = rib.bindings.get(&name).cloned();
|
2014-12-27 06:47:42 -06:00
|
|
|
if result.is_some() {
|
|
|
|
return result
|
2014-12-26 05:08:00 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
None
|
|
|
|
}
|
|
|
|
|
2014-02-05 15:15:24 -06:00
|
|
|
fn resolve_crate(&mut self, krate: &ast::Crate) {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving crate) starting");
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2014-09-12 05:10:30 -05:00
|
|
|
visit::walk_crate(self, krate);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2015-02-08 10:29:47 -06:00
|
|
|
fn check_if_primitive_type_name(&self, name: Name, span: Span) {
|
|
|
|
if let Some(_) = self.primitive_type_table.primitive_types.get(&name) {
|
2015-02-12 11:31:31 -06:00
|
|
|
span_err!(self.session, span, E0317,
|
2015-02-08 10:29:47 -06:00
|
|
|
"user-defined types or type parameters cannot shadow the primitive types");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-09 07:05:33 -06:00
|
|
|
fn resolve_item(&mut self, item: &Item) {
|
2014-09-30 19:11:34 -05:00
|
|
|
let name = item.ident.name;
|
|
|
|
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving item) resolving {}",
|
2014-09-30 19:11:34 -05:00
|
|
|
token::get_name(name));
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2013-03-20 00:17:42 -05:00
|
|
|
match item.node {
|
2015-02-05 01:19:07 -06:00
|
|
|
ItemEnum(_, ref generics) |
|
|
|
|
ItemTy(_, ref generics) |
|
|
|
|
ItemStruct(_, ref generics) => {
|
2015-02-08 10:29:47 -06:00
|
|
|
self.check_if_primitive_type_name(name, item.span);
|
|
|
|
|
2013-11-21 17:42:55 -06:00
|
|
|
self.with_type_parameter_rib(HasTypeParameters(generics,
|
2014-05-31 17:53:13 -05:00
|
|
|
TypeSpace,
|
2014-05-31 00:54:04 -05:00
|
|
|
ItemRibKind),
|
2015-02-05 01:19:07 -06:00
|
|
|
|this| visit::walk_item(this, item));
|
2012-10-15 14:27:09 -05:00
|
|
|
}
|
2015-02-05 01:19:07 -06:00
|
|
|
ItemFn(_, _, _, ref generics, _) => {
|
2013-11-21 17:42:55 -06:00
|
|
|
self.with_type_parameter_rib(HasTypeParameters(generics,
|
2015-02-05 01:19:07 -06:00
|
|
|
FnSpace,
|
2014-05-31 00:54:04 -05:00
|
|
|
ItemRibKind),
|
2015-02-05 01:19:07 -06:00
|
|
|
|this| visit::walk_item(this, item));
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2015-02-07 07:24:34 -06:00
|
|
|
ItemDefaultImpl(_, ref trait_ref) => {
|
2015-02-24 00:28:11 -06:00
|
|
|
self.with_optional_trait_ref(Some(trait_ref), |_| {});
|
2015-01-22 15:15:02 -06:00
|
|
|
}
|
2014-12-28 16:33:18 -06:00
|
|
|
ItemImpl(_, _,
|
2014-12-10 05:15:06 -06:00
|
|
|
ref generics,
|
2014-05-16 12:15:33 -05:00
|
|
|
ref implemented_traits,
|
|
|
|
ref self_type,
|
2014-08-04 15:56:56 -05:00
|
|
|
ref impl_items) => {
|
2015-02-05 01:19:07 -06:00
|
|
|
self.resolve_implementation(generics,
|
2012-07-18 18:28:31 -05:00
|
|
|
implemented_traits,
|
2014-05-16 12:15:33 -05:00
|
|
|
&**self_type,
|
2015-02-18 13:48:57 -06:00
|
|
|
&impl_items[..]);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2014-12-24 00:38:10 -06:00
|
|
|
ItemTrait(_, ref generics, ref bounds, ref trait_items) => {
|
2015-02-08 10:29:47 -06:00
|
|
|
self.check_if_primitive_type_name(name, item.span);
|
|
|
|
|
2012-05-22 12:54:12 -05:00
|
|
|
// Create a new rib for the self type.
|
2014-09-29 18:06:13 -05:00
|
|
|
let mut self_type_rib = Rib::new(ItemRibKind);
|
2014-05-31 00:54:04 -05:00
|
|
|
|
2014-07-06 18:02:48 -05:00
|
|
|
// plain insert (no renaming, types are not currently hygienic....)
|
|
|
|
let name = self.type_self_name;
|
2014-09-29 18:06:13 -05:00
|
|
|
self_type_rib.bindings.insert(name, DlDef(DefSelfTy(item.id)));
|
|
|
|
self.type_ribs.push(self_type_rib);
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2012-07-31 12:27:51 -05:00
|
|
|
// Create a new rib for the trait-wide type parameters.
|
2013-11-21 17:42:55 -06:00
|
|
|
self.with_type_parameter_rib(HasTypeParameters(generics,
|
2014-05-31 17:53:13 -05:00
|
|
|
TypeSpace,
|
2013-11-21 17:42:55 -06:00
|
|
|
NormalRibKind),
|
|
|
|
|this| {
|
2015-02-05 01:19:07 -06:00
|
|
|
this.visit_generics(generics);
|
|
|
|
visit::walk_ty_param_bounds_helper(this, bounds);
|
2014-08-27 20:46:52 -05:00
|
|
|
|
2015-01-31 11:20:46 -06:00
|
|
|
for trait_item in &(*trait_items) {
|
2014-10-28 13:48:52 -05:00
|
|
|
// Create a new rib for the trait_item-specific type
|
2012-05-22 12:54:12 -05:00
|
|
|
// parameters.
|
|
|
|
//
|
2013-02-14 20:37:25 -06:00
|
|
|
// FIXME #4951: Do we need a node ID here?
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2015-02-05 01:19:07 -06:00
|
|
|
let type_parameters = match *trait_item {
|
|
|
|
ast::RequiredMethod(ref ty_m) => {
|
|
|
|
HasTypeParameters(&ty_m.generics,
|
|
|
|
FnSpace,
|
|
|
|
MethodRibKind)
|
|
|
|
}
|
|
|
|
ast::ProvidedMethod(ref m) => {
|
|
|
|
HasTypeParameters(m.pe_generics(),
|
|
|
|
FnSpace,
|
|
|
|
MethodRibKind)
|
|
|
|
}
|
2015-02-17 11:29:13 -06:00
|
|
|
ast::TypeTraitItem(ref assoc_ty) => {
|
|
|
|
let ty_param = &assoc_ty.ty_param;
|
|
|
|
this.check_if_primitive_type_name(ty_param.ident.name,
|
|
|
|
ty_param.span);
|
|
|
|
NoTypeParameters
|
|
|
|
}
|
2015-02-05 01:19:07 -06:00
|
|
|
};
|
|
|
|
this.with_type_parameter_rib(type_parameters, |this| {
|
|
|
|
visit::walk_trait_item(this, trait_item)
|
|
|
|
});
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2013-11-21 17:42:55 -06:00
|
|
|
});
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2014-09-29 18:06:13 -05:00
|
|
|
self.type_ribs.pop();
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2015-02-05 01:19:07 -06:00
|
|
|
ItemMod(_) | ItemForeignMod(_) => {
|
2014-09-30 19:11:34 -05:00
|
|
|
self.with_scope(Some(name), |this| {
|
2015-02-05 01:19:07 -06:00
|
|
|
visit::walk_item(this, item);
|
2013-11-21 17:42:55 -06:00
|
|
|
});
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
rustc: Add `const` globals to the language
This change is an implementation of [RFC 69][rfc] which adds a third kind of
global to the language, `const`. This global is most similar to what the old
`static` was, and if you're unsure about what to use then you should use a
`const`.
The semantics of these three kinds of globals are:
* A `const` does not represent a memory location, but only a value. Constants
are translated as rvalues, which means that their values are directly inlined
at usage location (similar to a #define in C/C++). Constant values are, well,
constant, and can not be modified. Any "modification" is actually a
modification to a local value on the stack rather than the actual constant
itself.
Almost all values are allowed inside constants, whether they have interior
mutability or not. There are a few minor restrictions listed in the RFC, but
they should in general not come up too often.
* A `static` now always represents a memory location (unconditionally). Any
references to the same `static` are actually a reference to the same memory
location. Only values whose types ascribe to `Sync` are allowed in a `static`.
This restriction is in place because many threads may access a `static`
concurrently. Lifting this restriction (and allowing unsafe access) is a
future extension not implemented at this time.
* A `static mut` continues to always represent a memory location. All references
to a `static mut` continue to be `unsafe`.
This is a large breaking change, and many programs will need to be updated
accordingly. A summary of the breaking changes is:
* Statics may no longer be used in patterns. Statics now always represent a
memory location, which can sometimes be modified. To fix code, repurpose the
matched-on-`static` to a `const`.
static FOO: uint = 4;
match n {
FOO => { /* ... */ }
_ => { /* ... */ }
}
change this code to:
const FOO: uint = 4;
match n {
FOO => { /* ... */ }
_ => { /* ... */ }
}
* Statics may no longer refer to other statics by value. Due to statics being
able to change at runtime, allowing them to reference one another could
possibly lead to confusing semantics. If you are in this situation, use a
constant initializer instead. Note, however, that statics may reference other
statics by address, however.
* Statics may no longer be used in constant expressions, such as array lengths.
This is due to the same restrictions as listed above. Use a `const` instead.
[breaking-change]
[rfc]: https://github.com/rust-lang/rfcs/pull/246
2014-10-06 10:17:01 -05:00
|
|
|
ItemConst(..) | ItemStatic(..) => {
|
2013-09-26 21:10:16 -05:00
|
|
|
self.with_constant_rib(|this| {
|
2014-09-12 05:10:30 -05:00
|
|
|
visit::walk_item(this, item);
|
2012-10-15 14:27:09 -05:00
|
|
|
});
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2012-07-05 14:10:33 -05:00
|
|
|
|
2015-02-08 10:29:47 -06:00
|
|
|
ItemUse(ref view_path) => {
|
|
|
|
// check for imports shadowing primitive types
|
|
|
|
if let ast::ViewPathSimple(ident, _) = view_path.node {
|
2015-02-16 22:44:23 -06:00
|
|
|
match self.def_map.borrow().get(&item.id).map(|d| d.full_def()) {
|
|
|
|
Some(DefTy(..)) | Some(DefStruct(..)) | Some(DefTrait(..)) | None => {
|
2015-02-08 10:29:47 -06:00
|
|
|
self.check_if_primitive_type_name(ident.name, item.span);
|
|
|
|
}
|
|
|
|
_ => {}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ItemExternCrate(_) | ItemMac(..) => {
|
2013-12-25 12:10:33 -06:00
|
|
|
// do nothing, these are just around to be encoded
|
2014-12-23 13:34:36 -06:00
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-08 19:26:43 -06:00
|
|
|
fn with_type_parameter_rib<F>(&mut self, type_parameters: TypeParameters, f: F) where
|
|
|
|
F: FnOnce(&mut Resolver),
|
|
|
|
{
|
2012-08-06 14:34:08 -05:00
|
|
|
match type_parameters {
|
2015-02-05 01:19:07 -06:00
|
|
|
HasTypeParameters(generics, space, rib_kind) => {
|
2014-09-29 18:06:13 -05:00
|
|
|
let mut function_type_rib = Rib::new(rib_kind);
|
2014-10-08 23:28:50 -05:00
|
|
|
let mut seen_bindings = HashSet::new();
|
2013-08-03 11:45:23 -05:00
|
|
|
for (index, type_parameter) in generics.ty_params.iter().enumerate() {
|
2014-09-30 19:11:34 -05:00
|
|
|
let name = type_parameter.ident.name;
|
2015-02-05 01:19:07 -06:00
|
|
|
debug!("with_type_parameter_rib: {}", type_parameter.id);
|
2014-10-08 23:28:50 -05:00
|
|
|
|
2014-09-30 19:11:34 -05:00
|
|
|
if seen_bindings.contains(&name) {
|
2014-10-08 23:28:50 -05:00
|
|
|
self.resolve_error(type_parameter.span,
|
2015-01-07 10:58:31 -06:00
|
|
|
&format!("the name `{}` is already \
|
2015-02-05 01:19:07 -06:00
|
|
|
used for a type \
|
|
|
|
parameter in this type \
|
|
|
|
parameter list",
|
|
|
|
token::get_name(name)))
|
2014-10-08 23:28:50 -05:00
|
|
|
}
|
2014-09-30 19:11:34 -05:00
|
|
|
seen_bindings.insert(name);
|
2014-10-08 23:28:50 -05:00
|
|
|
|
2013-06-26 17:56:13 -05:00
|
|
|
// plain insert (no renaming)
|
2015-02-05 01:19:07 -06:00
|
|
|
function_type_rib.bindings.insert(name,
|
|
|
|
DlDef(DefTyParam(space,
|
|
|
|
index as u32,
|
|
|
|
local_def(type_parameter.id),
|
|
|
|
name)));
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2014-09-29 18:06:13 -05:00
|
|
|
self.type_ribs.push(function_type_rib);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2012-08-03 21:59:04 -05:00
|
|
|
NoTypeParameters => {
|
2012-05-22 12:54:12 -05:00
|
|
|
// Nothing to do.
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-09-26 21:10:16 -05:00
|
|
|
f(self);
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2012-08-06 14:34:08 -05:00
|
|
|
match type_parameters {
|
2014-09-29 18:06:13 -05:00
|
|
|
HasTypeParameters(..) => { self.type_ribs.pop(); }
|
2014-03-20 21:49:20 -05:00
|
|
|
NoTypeParameters => { }
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-08 19:26:43 -06:00
|
|
|
fn with_label_rib<F>(&mut self, f: F) where
|
|
|
|
F: FnOnce(&mut Resolver),
|
|
|
|
{
|
2014-09-29 18:06:13 -05:00
|
|
|
self.label_ribs.push(Rib::new(NormalRibKind));
|
2013-09-26 21:10:16 -05:00
|
|
|
f(self);
|
2014-09-29 18:06:13 -05:00
|
|
|
self.label_ribs.pop();
|
2012-08-14 21:20:56 -05:00
|
|
|
}
|
2013-02-21 13:08:50 -06:00
|
|
|
|
2014-12-08 19:26:43 -06:00
|
|
|
fn with_constant_rib<F>(&mut self, f: F) where
|
|
|
|
F: FnOnce(&mut Resolver),
|
|
|
|
{
|
2014-09-29 18:06:13 -05:00
|
|
|
self.value_ribs.push(Rib::new(ConstantItemRibKind));
|
|
|
|
self.type_ribs.push(Rib::new(ConstantItemRibKind));
|
2013-09-26 21:10:16 -05:00
|
|
|
f(self);
|
2014-09-29 18:06:13 -05:00
|
|
|
self.type_ribs.pop();
|
|
|
|
self.value_ribs.pop();
|
2012-10-15 14:27:09 -05:00
|
|
|
}
|
|
|
|
|
2013-10-02 07:33:01 -05:00
|
|
|
fn resolve_function(&mut self,
|
2014-01-27 06:18:36 -06:00
|
|
|
rib_kind: RibKind,
|
2015-02-05 01:19:07 -06:00
|
|
|
declaration: &FnDecl,
|
2014-09-07 12:09:06 -05:00
|
|
|
block: &Block) {
|
2012-05-22 12:54:12 -05:00
|
|
|
// Create a value rib for the function.
|
2015-02-05 01:19:07 -06:00
|
|
|
self.value_ribs.push(Rib::new(rib_kind));
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2012-08-14 21:20:56 -05:00
|
|
|
// Create a label rib for the function.
|
2015-02-05 01:19:07 -06:00
|
|
|
self.label_ribs.push(Rib::new(rib_kind));
|
2012-08-14 21:20:56 -05:00
|
|
|
|
2015-02-05 01:19:07 -06:00
|
|
|
// Add each argument to the rib.
|
|
|
|
let mut bindings_list = HashMap::new();
|
|
|
|
for argument in &declaration.inputs {
|
|
|
|
self.resolve_pattern(&*argument.pat,
|
|
|
|
ArgumentIrrefutableMode,
|
|
|
|
&mut bindings_list);
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2015-02-05 01:19:07 -06:00
|
|
|
self.visit_ty(&*argument.ty);
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2015-02-05 01:19:07 -06:00
|
|
|
debug!("(resolving function) recorded argument");
|
|
|
|
}
|
|
|
|
visit::walk_fn_ret_ty(self, &declaration.output);
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2015-02-05 01:19:07 -06:00
|
|
|
// Resolve the function body.
|
|
|
|
self.visit_block(&*block);
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2015-02-05 01:19:07 -06:00
|
|
|
debug!("(resolving function) leaving function");
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2014-09-29 18:06:13 -05:00
|
|
|
self.label_ribs.pop();
|
|
|
|
self.value_ribs.pop();
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2013-10-02 07:33:01 -05:00
|
|
|
fn resolve_trait_reference(&mut self,
|
2014-07-07 21:26:02 -05:00
|
|
|
id: NodeId,
|
2015-01-30 02:09:44 -06:00
|
|
|
trait_path: &Path,
|
2015-02-05 01:19:07 -06:00
|
|
|
path_depth: usize)
|
2015-02-16 22:44:23 -06:00
|
|
|
-> Result<PathResolution, ()> {
|
|
|
|
if let Some(path_res) = self.resolve_path(id, trait_path, path_depth, TypeNS, true) {
|
|
|
|
if let DefTrait(_) = path_res.base_def {
|
|
|
|
debug!("(resolving trait) found trait def: {:?}", path_res);
|
|
|
|
Ok(path_res)
|
|
|
|
} else {
|
2015-02-05 01:19:07 -06:00
|
|
|
self.resolve_error(trait_path.span,
|
|
|
|
&format!("`{}` is not a trait",
|
|
|
|
self.path_names_to_string(trait_path, path_depth)));
|
|
|
|
|
|
|
|
// If it's a typedef, give a note
|
2015-02-16 22:44:23 -06:00
|
|
|
if let DefTy(..) = path_res.base_def {
|
2015-02-05 01:19:07 -06:00
|
|
|
self.session.span_note(trait_path.span,
|
|
|
|
"`type` aliases cannot be used for traits");
|
2014-06-19 17:23:51 -05:00
|
|
|
}
|
2015-02-05 01:19:07 -06:00
|
|
|
Err(())
|
|
|
|
}
|
2015-02-16 22:44:23 -06:00
|
|
|
} else {
|
|
|
|
let msg = format!("use of undeclared trait name `{}`",
|
|
|
|
self.path_names_to_string(trait_path, path_depth));
|
|
|
|
self.resolve_error(trait_path.span, &msg[]);
|
|
|
|
Err(())
|
2013-03-27 05:16:28 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-05 01:19:07 -06:00
|
|
|
fn resolve_generics(&mut self, generics: &Generics) {
|
2015-02-11 01:33:49 -06:00
|
|
|
for type_parameter in &*generics.ty_params {
|
2015-02-05 01:19:07 -06:00
|
|
|
self.check_if_primitive_type_name(type_parameter.ident.name, type_parameter.span);
|
|
|
|
}
|
|
|
|
for predicate in &generics.where_clause.predicates {
|
2014-11-28 22:08:30 -06:00
|
|
|
match predicate {
|
2015-02-05 01:19:07 -06:00
|
|
|
&ast::WherePredicate::BoundPredicate(_) |
|
2014-12-20 04:29:19 -06:00
|
|
|
&ast::WherePredicate::RegionPredicate(_) => {}
|
2014-12-02 17:03:02 -06:00
|
|
|
&ast::WherePredicate::EqPredicate(ref eq_pred) => {
|
2015-02-16 22:44:23 -06:00
|
|
|
let path_res = self.resolve_path(eq_pred.id, &eq_pred.path, 0, TypeNS, true);
|
|
|
|
if let Some(PathResolution { base_def: DefTyParam(..), .. }) = path_res {
|
|
|
|
self.record_def(eq_pred.id, path_res.unwrap());
|
|
|
|
} else {
|
|
|
|
self.resolve_error(eq_pred.path.span, "undeclared associated type");
|
2014-11-28 22:08:30 -06:00
|
|
|
}
|
|
|
|
}
|
2014-08-11 11:32:26 -05:00
|
|
|
}
|
|
|
|
}
|
2015-02-05 01:19:07 -06:00
|
|
|
visit::walk_generics(self, generics);
|
2012-07-10 15:44:20 -05:00
|
|
|
}
|
|
|
|
|
2014-12-08 19:26:43 -06:00
|
|
|
fn with_current_self_type<T, F>(&mut self, self_type: &Ty, f: F) -> T where
|
|
|
|
F: FnOnce(&mut Resolver) -> T,
|
|
|
|
{
|
2014-05-08 16:35:09 -05:00
|
|
|
// Handle nested impls (inside fn bodies)
|
|
|
|
let previous_value = replace(&mut self.current_self_type, Some(self_type.clone()));
|
|
|
|
let result = f(self);
|
|
|
|
self.current_self_type = previous_value;
|
|
|
|
result
|
|
|
|
}
|
|
|
|
|
2015-01-30 02:09:44 -06:00
|
|
|
fn with_optional_trait_ref<T, F>(&mut self,
|
2015-02-24 00:28:11 -06:00
|
|
|
opt_trait_ref: Option<&TraitRef>,
|
2014-12-08 19:26:43 -06:00
|
|
|
f: F) -> T where
|
|
|
|
F: FnOnce(&mut Resolver) -> T,
|
|
|
|
{
|
2015-02-05 01:19:07 -06:00
|
|
|
let mut new_val = None;
|
2015-02-24 00:28:11 -06:00
|
|
|
if let Some(trait_ref) = opt_trait_ref {
|
2015-02-05 01:19:07 -06:00
|
|
|
match self.resolve_trait_reference(trait_ref.ref_id, &trait_ref.path, 0) {
|
2015-02-16 22:44:23 -06:00
|
|
|
Ok(path_res) => {
|
|
|
|
self.record_def(trait_ref.ref_id, path_res);
|
|
|
|
new_val = Some((path_res.base_def.def_id(), trait_ref.clone()));
|
2014-05-08 16:35:09 -05:00
|
|
|
}
|
2015-02-05 01:19:07 -06:00
|
|
|
Err(_) => { /* error was already reported */ }
|
2014-05-08 16:35:09 -05:00
|
|
|
}
|
2015-02-05 01:19:07 -06:00
|
|
|
visit::walk_trait_ref(self, trait_ref);
|
|
|
|
}
|
2014-05-08 16:35:09 -05:00
|
|
|
let original_trait_ref = replace(&mut self.current_trait_ref, new_val);
|
|
|
|
let result = f(self);
|
|
|
|
self.current_trait_ref = original_trait_ref;
|
|
|
|
result
|
|
|
|
}
|
|
|
|
|
2013-10-02 07:33:01 -05:00
|
|
|
fn resolve_implementation(&mut self,
|
2014-05-31 17:53:13 -05:00
|
|
|
generics: &Generics,
|
|
|
|
opt_trait_reference: &Option<TraitRef>,
|
|
|
|
self_type: &Ty,
|
2014-08-04 15:56:56 -05:00
|
|
|
impl_items: &[ImplItem]) {
|
2012-05-22 12:54:12 -05:00
|
|
|
// If applicable, create a rib for the type parameters.
|
2013-11-21 17:42:55 -06:00
|
|
|
self.with_type_parameter_rib(HasTypeParameters(generics,
|
2014-05-31 17:53:13 -05:00
|
|
|
TypeSpace,
|
2015-02-05 01:19:07 -06:00
|
|
|
ItemRibKind),
|
2013-11-21 17:42:55 -06:00
|
|
|
|this| {
|
2012-05-22 12:54:12 -05:00
|
|
|
// Resolve the type parameters.
|
2015-02-05 01:19:07 -06:00
|
|
|
this.visit_generics(generics);
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2012-07-31 12:27:51 -05:00
|
|
|
// Resolve the trait reference, if necessary.
|
2015-02-24 00:28:11 -06:00
|
|
|
this.with_optional_trait_ref(opt_trait_reference.as_ref(), |this| {
|
2014-05-08 16:35:09 -05:00
|
|
|
// Resolve the self type.
|
2015-02-05 01:19:07 -06:00
|
|
|
this.visit_ty(self_type);
|
2014-05-08 16:35:09 -05:00
|
|
|
|
|
|
|
this.with_current_self_type(self_type, |this| {
|
2015-01-31 11:20:46 -06:00
|
|
|
for impl_item in impl_items {
|
2014-08-04 15:56:56 -05:00
|
|
|
match *impl_item {
|
2014-09-07 12:09:06 -05:00
|
|
|
MethodImplItem(ref method) => {
|
2014-08-04 15:56:56 -05:00
|
|
|
// If this is a trait impl, ensure the method
|
|
|
|
// exists in trait
|
2014-09-30 19:11:34 -05:00
|
|
|
this.check_trait_item(method.pe_ident().name,
|
2014-08-04 15:56:56 -05:00
|
|
|
method.span);
|
|
|
|
|
|
|
|
// We also need a new scope for the method-
|
|
|
|
// specific type parameters.
|
2015-02-05 01:19:07 -06:00
|
|
|
let type_parameters =
|
|
|
|
HasTypeParameters(method.pe_generics(),
|
|
|
|
FnSpace,
|
|
|
|
MethodRibKind);
|
|
|
|
this.with_type_parameter_rib(type_parameters, |this| {
|
|
|
|
visit::walk_method_helper(this, &**method);
|
|
|
|
});
|
2014-08-04 15:56:56 -05:00
|
|
|
}
|
2014-08-05 21:44:21 -05:00
|
|
|
TypeImplItem(ref typedef) => {
|
|
|
|
// If this is a trait impl, ensure the method
|
|
|
|
// exists in trait
|
2014-09-30 19:11:34 -05:00
|
|
|
this.check_trait_item(typedef.ident.name,
|
2014-08-05 21:44:21 -05:00
|
|
|
typedef.span);
|
|
|
|
|
2015-02-05 01:19:07 -06:00
|
|
|
this.visit_ty(&*typedef.typ);
|
2014-08-05 21:44:21 -05:00
|
|
|
}
|
2014-08-04 15:56:56 -05:00
|
|
|
}
|
2013-03-27 05:16:28 -05:00
|
|
|
}
|
2014-05-08 16:35:09 -05:00
|
|
|
});
|
|
|
|
});
|
2013-11-21 17:42:55 -06:00
|
|
|
});
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2014-09-30 19:11:34 -05:00
|
|
|
fn check_trait_item(&self, name: Name, span: Span) {
|
2014-06-18 08:16:45 -05:00
|
|
|
// If there is a TraitRef in scope for an impl, then the method must be in the trait.
|
2015-01-31 11:20:46 -06:00
|
|
|
if let Some((did, ref trait_ref)) = self.current_trait_ref {
|
2015-02-11 01:32:25 -06:00
|
|
|
if !self.trait_item_map.contains_key(&(name, did)) {
|
2015-01-31 13:20:24 -06:00
|
|
|
let path_str = self.path_names_to_string(&trait_ref.path, 0);
|
2014-08-04 15:56:56 -05:00
|
|
|
self.resolve_error(span,
|
2015-01-07 10:58:31 -06:00
|
|
|
&format!("method `{}` is not a member of trait `{}`",
|
2014-09-30 19:11:34 -05:00
|
|
|
token::get_name(name),
|
2015-02-20 13:08:14 -06:00
|
|
|
path_str));
|
2014-06-18 08:16:45 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-06 06:00:46 -06:00
|
|
|
fn resolve_local(&mut self, local: &Local) {
|
2012-05-22 12:54:12 -05:00
|
|
|
// Resolve the type.
|
2015-02-05 01:19:07 -06:00
|
|
|
visit::walk_ty_opt(self, &local.ty);
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2015-02-05 01:19:07 -06:00
|
|
|
// Resolve the initializer.
|
|
|
|
visit::walk_expr_opt(self, &local.init);
|
2012-05-22 12:54:12 -05:00
|
|
|
|
|
|
|
// Resolve the pattern.
|
2014-06-10 16:39:10 -05:00
|
|
|
self.resolve_pattern(&*local.pat,
|
|
|
|
LocalIrrefutableMode,
|
2015-02-05 01:19:07 -06:00
|
|
|
&mut HashMap::new());
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2013-09-05 16:15:00 -05:00
|
|
|
// build a map from pattern identifiers to binding-info's.
|
|
|
|
// this is done hygienically. This could arise for a macro
|
|
|
|
// that expands into an or-pattern where one 'x' was from the
|
|
|
|
// user and one 'x' came from the macro.
|
2014-04-14 03:30:59 -05:00
|
|
|
fn binding_mode_map(&mut self, pat: &Pat) -> BindingMap {
|
2013-04-03 08:28:36 -05:00
|
|
|
let mut result = HashMap::new();
|
2014-06-30 20:02:14 -05:00
|
|
|
pat_bindings(&self.def_map, pat, |binding_mode, _id, sp, path1| {
|
|
|
|
let name = mtwt::resolve(path1.node);
|
2014-12-18 11:17:41 -06:00
|
|
|
result.insert(name, BindingInfo {
|
|
|
|
span: sp,
|
|
|
|
binding_mode: binding_mode
|
|
|
|
});
|
2013-11-21 17:42:55 -06:00
|
|
|
});
|
2012-08-06 09:20:23 -05:00
|
|
|
return result;
|
2012-07-10 20:24:41 -05:00
|
|
|
}
|
|
|
|
|
2013-09-05 16:15:00 -05:00
|
|
|
// check that all of the arms in an or-pattern have exactly the
|
|
|
|
// same set of bindings, with the same binding modes for each.
|
2013-10-02 07:33:01 -05:00
|
|
|
fn check_consistent_bindings(&mut self, arm: &Arm) {
|
2014-02-28 17:25:15 -06:00
|
|
|
if arm.pats.len() == 0 {
|
|
|
|
return
|
|
|
|
}
|
2014-10-15 01:05:01 -05:00
|
|
|
let map_0 = self.binding_mode_map(&*arm.pats[0]);
|
2013-08-03 11:45:23 -05:00
|
|
|
for (i, p) in arm.pats.iter().enumerate() {
|
2014-05-16 12:15:33 -05:00
|
|
|
let map_i = self.binding_mode_map(&**p);
|
2012-08-06 09:20:23 -05:00
|
|
|
|
2015-01-31 11:20:46 -06:00
|
|
|
for (&key, &binding_0) in &map_0 {
|
2014-11-06 11:25:16 -06:00
|
|
|
match map_i.get(&key) {
|
2014-05-28 11:24:28 -05:00
|
|
|
None => {
|
|
|
|
self.resolve_error(
|
|
|
|
p.span,
|
2015-01-07 10:58:31 -06:00
|
|
|
&format!("variable `{}` from pattern #1 is \
|
2014-05-28 11:24:28 -05:00
|
|
|
not bound in pattern #{}",
|
|
|
|
token::get_name(key),
|
2015-02-20 13:08:14 -06:00
|
|
|
i + 1));
|
2014-05-28 11:24:28 -05:00
|
|
|
}
|
|
|
|
Some(binding_i) => {
|
|
|
|
if binding_0.binding_mode != binding_i.binding_mode {
|
|
|
|
self.resolve_error(
|
|
|
|
binding_i.span,
|
2015-01-07 10:58:31 -06:00
|
|
|
&format!("variable `{}` is bound with different \
|
2014-05-28 11:24:28 -05:00
|
|
|
mode in pattern #{} than in pattern #1",
|
|
|
|
token::get_name(key),
|
2015-02-20 13:08:14 -06:00
|
|
|
i + 1));
|
2014-05-28 11:24:28 -05:00
|
|
|
}
|
|
|
|
}
|
2012-08-06 09:20:23 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-31 11:20:46 -06:00
|
|
|
for (&key, &binding) in &map_i {
|
2013-02-08 16:08:02 -06:00
|
|
|
if !map_0.contains_key(&key) {
|
2013-08-13 19:54:14 -05:00
|
|
|
self.resolve_error(
|
2012-08-06 09:20:23 -05:00
|
|
|
binding.span,
|
2015-01-07 10:58:31 -06:00
|
|
|
&format!("variable `{}` from pattern {}{} is \
|
2014-05-28 11:24:28 -05:00
|
|
|
not bound in pattern {}1",
|
2014-02-13 23:07:09 -06:00
|
|
|
token::get_name(key),
|
2015-02-20 13:08:14 -06:00
|
|
|
"#", i + 1, "#"));
|
2012-08-06 09:20:23 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-07-10 20:24:41 -05:00
|
|
|
}
|
|
|
|
|
2013-10-02 07:33:01 -05:00
|
|
|
fn resolve_arm(&mut self, arm: &Arm) {
|
2014-09-29 18:06:13 -05:00
|
|
|
self.value_ribs.push(Rib::new(NormalRibKind));
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2013-12-21 17:27:26 -06:00
|
|
|
let mut bindings_list = HashMap::new();
|
2015-01-31 11:20:46 -06:00
|
|
|
for pattern in &arm.pats {
|
2014-06-10 16:39:10 -05:00
|
|
|
self.resolve_pattern(&**pattern, RefutableMode, &mut bindings_list);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2012-07-10 20:24:41 -05:00
|
|
|
// This has to happen *after* we determine which
|
|
|
|
// pat_idents are variants
|
|
|
|
self.check_consistent_bindings(arm);
|
|
|
|
|
2014-09-09 17:54:36 -05:00
|
|
|
visit::walk_expr_opt(self, &arm.guard);
|
2015-02-05 01:19:07 -06:00
|
|
|
self.visit_expr(&*arm.body);
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2014-09-29 18:06:13 -05:00
|
|
|
self.value_ribs.pop();
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2014-01-06 06:00:46 -06:00
|
|
|
fn resolve_block(&mut self, block: &Block) {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving block) entering block");
|
2014-09-29 18:06:13 -05:00
|
|
|
self.value_ribs.push(Rib::new(NormalRibKind));
|
2012-05-22 12:54:12 -05:00
|
|
|
|
|
|
|
// Move down in the graph, if there's an anonymous module rooted here.
|
2014-04-14 03:30:59 -05:00
|
|
|
let orig_module = self.current_module.clone();
|
2014-11-06 11:25:16 -06:00
|
|
|
match orig_module.anonymous_children.borrow().get(&block.id) {
|
2012-08-20 14:23:37 -05:00
|
|
|
None => { /* Nothing to do. */ }
|
2014-04-14 03:30:59 -05:00
|
|
|
Some(anonymous_module) => {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving block) found anonymous module, moving \
|
2012-08-22 19:24:52 -05:00
|
|
|
down");
|
2014-04-14 03:30:59 -05:00
|
|
|
self.current_module = anonymous_module.clone();
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-13 03:39:05 -06:00
|
|
|
// Check for imports appearing after non-item statements.
|
|
|
|
let mut found_non_item = false;
|
2015-01-31 11:20:46 -06:00
|
|
|
for statement in &block.stmts {
|
2015-01-13 03:39:05 -06:00
|
|
|
if let ast::StmtDecl(ref declaration, _) = statement.node {
|
|
|
|
if let ast::DeclItem(ref i) = declaration.node {
|
|
|
|
match i.node {
|
|
|
|
ItemExternCrate(_) | ItemUse(_) if found_non_item => {
|
|
|
|
span_err!(self.session, i.span, E0154,
|
|
|
|
"imports are not allowed after non-item statements");
|
|
|
|
}
|
|
|
|
_ => {}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
found_non_item = true
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
found_non_item = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-05-22 12:54:12 -05:00
|
|
|
// Descend into the block.
|
2014-09-12 05:10:30 -05:00
|
|
|
visit::walk_block(self, block);
|
2012-05-22 12:54:12 -05:00
|
|
|
|
|
|
|
// Move back up.
|
|
|
|
self.current_module = orig_module;
|
|
|
|
|
2014-09-29 18:06:13 -05:00
|
|
|
self.value_ribs.pop();
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving block) leaving block");
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2013-10-02 07:33:01 -05:00
|
|
|
fn resolve_type(&mut self, ty: &Ty) {
|
2012-08-06 14:34:08 -05:00
|
|
|
match ty.node {
|
2015-02-17 11:29:13 -06:00
|
|
|
// `<T>::a::b::c` is resolved by typeck alone.
|
|
|
|
TyPath(Some(ast::QSelf { position: 0, .. }), _) => {}
|
2015-01-31 13:20:24 -06:00
|
|
|
|
2015-02-17 11:29:13 -06:00
|
|
|
TyPath(ref maybe_qself, ref path) => {
|
|
|
|
let max_assoc_types = if let Some(ref qself) = *maybe_qself {
|
2015-02-05 01:19:07 -06:00
|
|
|
// Make sure the trait is valid.
|
2015-02-05 05:20:48 -06:00
|
|
|
let _ = self.resolve_trait_reference(ty.id, path, 1);
|
2015-02-17 11:29:13 -06:00
|
|
|
path.segments.len() - qself.position
|
2015-02-05 05:20:48 -06:00
|
|
|
} else {
|
|
|
|
path.segments.len()
|
|
|
|
};
|
|
|
|
|
2015-02-16 22:44:23 -06:00
|
|
|
let mut resolution = None;
|
2015-02-05 05:20:48 -06:00
|
|
|
for depth in 0..max_assoc_types {
|
|
|
|
self.with_no_errors(|this| {
|
2015-02-16 22:44:23 -06:00
|
|
|
resolution = this.resolve_path(ty.id, path, depth, TypeNS, true);
|
2015-02-05 05:20:48 -06:00
|
|
|
});
|
2015-02-16 22:44:23 -06:00
|
|
|
if resolution.is_some() {
|
2015-02-05 05:20:48 -06:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2015-02-16 22:44:23 -06:00
|
|
|
if let Some(DefMod(_)) = resolution.map(|r| r.base_def) {
|
2015-02-05 05:20:48 -06:00
|
|
|
// A module is not a valid type.
|
2015-02-16 22:44:23 -06:00
|
|
|
resolution = None;
|
2015-01-31 13:20:24 -06:00
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
|
|
|
|
// This is a path in the type namespace. Walk through scopes
|
2014-03-06 01:35:12 -06:00
|
|
|
// looking for it.
|
2015-02-16 22:44:23 -06:00
|
|
|
match resolution {
|
2012-08-20 14:23:37 -05:00
|
|
|
Some(def) => {
|
2012-05-22 12:54:12 -05:00
|
|
|
// Write the result into the def map.
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving type) writing resolution for `{}` \
|
2015-01-15 01:46:12 -06:00
|
|
|
(id {}) = {:?}",
|
2015-01-31 13:20:24 -06:00
|
|
|
self.path_names_to_string(path, 0),
|
2015-01-29 13:18:17 -06:00
|
|
|
ty.id, def);
|
|
|
|
self.record_def(ty.id, def);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2012-08-20 14:23:37 -05:00
|
|
|
None => {
|
2015-02-05 05:20:48 -06:00
|
|
|
// Keep reporting some errors even if they're ignored above.
|
|
|
|
self.resolve_path(ty.id, path, 0, TypeNS, true);
|
|
|
|
|
2015-02-17 11:29:13 -06:00
|
|
|
let kind = if maybe_qself.is_some() {
|
|
|
|
"associated type"
|
|
|
|
} else {
|
|
|
|
"type name"
|
2015-01-30 21:51:21 -06:00
|
|
|
};
|
2015-02-17 11:29:13 -06:00
|
|
|
|
2015-01-30 21:51:21 -06:00
|
|
|
let msg = format!("use of undeclared {} `{}`", kind,
|
2015-01-31 13:20:24 -06:00
|
|
|
self.path_names_to_string(path, 0));
|
2015-02-18 13:48:57 -06:00
|
|
|
self.resolve_error(ty.span, &msg[..]);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
2014-11-20 14:08:48 -06:00
|
|
|
}
|
2015-02-05 01:19:07 -06:00
|
|
|
_ => {}
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2015-02-05 01:19:07 -06:00
|
|
|
// Resolve embedded types.
|
|
|
|
visit::walk_ty(self, ty);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2013-10-02 07:33:01 -05:00
|
|
|
fn resolve_pattern(&mut self,
|
2014-04-14 03:30:59 -05:00
|
|
|
pattern: &Pat,
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
mode: PatternBindingMode,
|
|
|
|
// Maps idents to the node ID for the (outermost)
|
|
|
|
// pattern that binds them
|
2014-09-30 19:11:34 -05:00
|
|
|
bindings_list: &mut HashMap<Name, NodeId>) {
|
2012-07-27 15:03:04 -05:00
|
|
|
let pat_id = pattern.id;
|
2013-11-21 17:42:55 -06:00
|
|
|
walk_pat(pattern, |pattern| {
|
2012-08-06 14:34:08 -05:00
|
|
|
match pattern.node {
|
2014-06-30 20:02:14 -05:00
|
|
|
PatIdent(binding_mode, ref path1, _) => {
|
2012-05-22 12:54:12 -05:00
|
|
|
|
|
|
|
// The meaning of pat_ident with no type parameters
|
2012-10-30 17:53:06 -05:00
|
|
|
// depends on whether an enum variant or unit-like struct
|
|
|
|
// with that name is in scope. The probing lookup has to
|
|
|
|
// be careful not to emit spurious errors. Only matching
|
|
|
|
// patterns (match) can match nullary variants or
|
|
|
|
// unit-like structs. For binding patterns (let), matching
|
|
|
|
// such a value is simply disallowed (since it's rarely
|
|
|
|
// what you want).
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2014-06-30 20:02:14 -05:00
|
|
|
let ident = path1.node;
|
2014-02-24 14:47:19 -06:00
|
|
|
let renamed = mtwt::resolve(ident);
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2014-09-30 19:11:34 -05:00
|
|
|
match self.resolve_bare_identifier_pattern(ident.name, pattern.span) {
|
2015-02-05 01:19:07 -06:00
|
|
|
FoundStructOrEnumVariant(def, lp)
|
2012-10-30 17:53:06 -05:00
|
|
|
if mode == RefutableMode => {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving pattern) resolving `{}` to \
|
2012-10-30 17:53:06 -05:00
|
|
|
struct or enum variant",
|
2014-02-13 23:07:09 -06:00
|
|
|
token::get_name(renamed));
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2013-01-24 18:24:45 -06:00
|
|
|
self.enforce_default_binding_mode(
|
|
|
|
pattern,
|
|
|
|
binding_mode,
|
|
|
|
"an enum variant");
|
2015-02-16 22:44:23 -06:00
|
|
|
self.record_def(pattern.id, PathResolution {
|
|
|
|
base_def: def,
|
|
|
|
last_private: lp,
|
|
|
|
depth: 0
|
|
|
|
});
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2013-11-28 14:22:53 -06:00
|
|
|
FoundStructOrEnumVariant(..) => {
|
2014-05-16 12:45:16 -05:00
|
|
|
self.resolve_error(
|
|
|
|
pattern.span,
|
2015-01-07 10:58:31 -06:00
|
|
|
&format!("declaration of `{}` shadows an enum \
|
2014-05-16 12:45:16 -05:00
|
|
|
variant or unit-like struct in \
|
|
|
|
scope",
|
2015-02-20 13:08:14 -06:00
|
|
|
token::get_name(renamed)));
|
2012-07-06 21:06:58 -05:00
|
|
|
}
|
2015-02-05 01:19:07 -06:00
|
|
|
FoundConst(def, lp) if mode == RefutableMode => {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving pattern) resolving `{}` to \
|
2012-11-13 00:10:15 -06:00
|
|
|
constant",
|
2014-02-13 23:07:09 -06:00
|
|
|
token::get_name(renamed));
|
2012-11-13 00:10:15 -06:00
|
|
|
|
2013-01-24 18:24:45 -06:00
|
|
|
self.enforce_default_binding_mode(
|
|
|
|
pattern,
|
|
|
|
binding_mode,
|
|
|
|
"a constant");
|
2015-02-16 22:44:23 -06:00
|
|
|
self.record_def(pattern.id, PathResolution {
|
|
|
|
base_def: def,
|
|
|
|
last_private: lp,
|
|
|
|
depth: 0
|
|
|
|
});
|
2012-11-13 00:10:15 -06:00
|
|
|
}
|
2013-11-28 14:22:53 -06:00
|
|
|
FoundConst(..) => {
|
2013-08-13 19:54:14 -05:00
|
|
|
self.resolve_error(pattern.span,
|
2013-10-02 07:33:01 -05:00
|
|
|
"only irrefutable patterns \
|
2013-05-19 00:07:44 -05:00
|
|
|
allowed here");
|
2012-07-06 21:06:58 -05:00
|
|
|
}
|
2012-10-30 17:53:06 -05:00
|
|
|
BareIdentifierPatternUnresolved => {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving pattern) binding `{}`",
|
2014-02-13 23:07:09 -06:00
|
|
|
token::get_name(renamed));
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2014-09-17 10:17:09 -05:00
|
|
|
let def = DefLocal(pattern.id);
|
2012-05-22 12:54:12 -05:00
|
|
|
|
|
|
|
// Record the definition so that later passes
|
|
|
|
// will be able to distinguish variants from
|
|
|
|
// locals in patterns.
|
|
|
|
|
2015-02-16 22:44:23 -06:00
|
|
|
self.record_def(pattern.id, PathResolution {
|
|
|
|
base_def: def,
|
|
|
|
last_private: LastMod(AllPublic),
|
|
|
|
depth: 0
|
|
|
|
});
|
2012-05-22 12:54:12 -05:00
|
|
|
|
|
|
|
// Add the binding to the local ribs, if it
|
|
|
|
// doesn't already exist in the bindings list. (We
|
|
|
|
// must not add it if it's in the bindings list
|
|
|
|
// because that breaks the assumptions later
|
|
|
|
// passes make about or-patterns.)
|
2014-06-10 16:39:10 -05:00
|
|
|
if !bindings_list.contains_key(&renamed) {
|
|
|
|
let this = &mut *self;
|
2014-09-29 18:06:13 -05:00
|
|
|
let last_rib = this.value_ribs.last_mut().unwrap();
|
|
|
|
last_rib.bindings.insert(renamed, DlDef(def));
|
2014-06-10 16:39:10 -05:00
|
|
|
bindings_list.insert(renamed, pat_id);
|
2014-10-08 23:28:50 -05:00
|
|
|
} else if mode == ArgumentIrrefutableMode &&
|
|
|
|
bindings_list.contains_key(&renamed) {
|
|
|
|
// Forbid duplicate bindings in the same
|
|
|
|
// parameter list.
|
|
|
|
self.resolve_error(pattern.span,
|
2015-01-07 10:58:31 -06:00
|
|
|
&format!("identifier `{}` \
|
2014-10-08 23:28:50 -05:00
|
|
|
is bound more \
|
|
|
|
than once in \
|
|
|
|
this parameter \
|
|
|
|
list",
|
|
|
|
token::get_ident(
|
|
|
|
ident))
|
2015-02-20 13:08:14 -06:00
|
|
|
)
|
2014-11-06 11:25:16 -06:00
|
|
|
} else if bindings_list.get(&renamed) ==
|
2014-06-10 16:39:10 -05:00
|
|
|
Some(&pat_id) {
|
|
|
|
// Then this is a duplicate variable in the
|
|
|
|
// same disjunction, which is an error.
|
|
|
|
self.resolve_error(pattern.span,
|
2015-01-07 10:58:31 -06:00
|
|
|
&format!("identifier `{}` is bound \
|
2014-06-10 16:39:10 -05:00
|
|
|
more than once in the same \
|
|
|
|
pattern",
|
2015-02-20 13:08:14 -06:00
|
|
|
token::get_ident(ident)));
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2014-06-10 16:39:10 -05:00
|
|
|
// Else, not bound in the same pattern: do
|
|
|
|
// nothing.
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-09-01 20:45:37 -05:00
|
|
|
PatEnum(ref path, _) => {
|
2013-03-21 02:27:26 -05:00
|
|
|
// This must be an enum variant, struct or const.
|
2015-02-16 22:44:23 -06:00
|
|
|
if let Some(path_res) = self.resolve_path(pat_id, path, 0, ValueNS, false) {
|
|
|
|
match path_res.base_def {
|
|
|
|
DefVariant(..) | DefStruct(..) | DefConst(..) => {
|
|
|
|
self.record_def(pattern.id, path_res);
|
|
|
|
}
|
|
|
|
DefStatic(..) => {
|
|
|
|
self.resolve_error(path.span,
|
|
|
|
"static variables cannot be \
|
|
|
|
referenced in a pattern, \
|
|
|
|
use a `const` instead");
|
|
|
|
}
|
|
|
|
_ => {
|
|
|
|
self.resolve_error(path.span,
|
|
|
|
&format!("`{}` is not an enum variant, struct or const",
|
|
|
|
token::get_ident(
|
|
|
|
path.segments.last().unwrap().identifier)));
|
|
|
|
}
|
2013-03-13 00:39:32 -05:00
|
|
|
}
|
2015-02-16 22:44:23 -06:00
|
|
|
} else {
|
|
|
|
self.resolve_error(path.span,
|
|
|
|
&format!("unresolved enum variant, struct or const `{}`",
|
|
|
|
token::get_ident(path.segments.last().unwrap().identifier)));
|
2013-03-13 00:39:32 -05:00
|
|
|
}
|
2015-02-05 01:19:07 -06:00
|
|
|
visit::walk_path(self, path);
|
2012-07-10 14:29:30 -05:00
|
|
|
}
|
|
|
|
|
2013-09-01 20:45:37 -05:00
|
|
|
PatStruct(ref path, _, _) => {
|
2015-01-31 13:20:24 -06:00
|
|
|
match self.resolve_path(pat_id, path, 0, TypeNS, false) {
|
2014-07-04 18:45:47 -05:00
|
|
|
Some(definition) => {
|
2012-08-07 21:12:58 -05:00
|
|
|
self.record_def(pattern.id, definition);
|
|
|
|
}
|
2012-12-10 14:37:50 -06:00
|
|
|
result => {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving pattern) didn't find struct \
|
2014-12-20 02:09:35 -06:00
|
|
|
def: {:?}", result);
|
2013-09-28 00:38:08 -05:00
|
|
|
let msg = format!("`{}` does not name a structure",
|
2015-01-31 13:20:24 -06:00
|
|
|
self.path_names_to_string(path, 0));
|
2015-02-18 13:48:57 -06:00
|
|
|
self.resolve_error(path.span, &msg[..]);
|
2012-08-06 19:01:14 -05:00
|
|
|
}
|
|
|
|
}
|
2015-02-05 01:19:07 -06:00
|
|
|
visit::walk_path(self, path);
|
|
|
|
}
|
|
|
|
|
|
|
|
PatLit(_) | PatRange(..) => {
|
|
|
|
visit::walk_pat(self, pattern);
|
2012-08-06 19:01:14 -05:00
|
|
|
}
|
|
|
|
|
2012-07-31 21:25:24 -05:00
|
|
|
_ => {
|
2012-05-22 12:54:12 -05:00
|
|
|
// Nothing to do.
|
|
|
|
}
|
|
|
|
}
|
2013-08-02 01:17:20 -05:00
|
|
|
true
|
2013-11-21 17:42:55 -06:00
|
|
|
});
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2014-09-30 19:11:34 -05:00
|
|
|
fn resolve_bare_identifier_pattern(&mut self, name: Name, span: Span)
|
2014-04-14 03:30:59 -05:00
|
|
|
-> BareIdentifierPatternResolution {
|
|
|
|
let module = self.current_module.clone();
|
|
|
|
match self.resolve_item_in_lexical_scope(module,
|
2012-10-30 17:53:06 -05:00
|
|
|
name,
|
2014-05-16 17:44:14 -05:00
|
|
|
ValueNS) {
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
Success((target, _)) => {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolve bare identifier pattern) succeeded in \
|
2014-12-20 02:09:35 -06:00
|
|
|
finding {} at {:?}",
|
2014-09-30 19:11:34 -05:00
|
|
|
token::get_name(name),
|
2014-03-28 12:29:55 -05:00
|
|
|
target.bindings.value_def.borrow());
|
|
|
|
match *target.bindings.value_def.borrow() {
|
2012-08-20 14:23:37 -05:00
|
|
|
None => {
|
2014-10-09 14:17:22 -05:00
|
|
|
panic!("resolved name in the value namespace to a \
|
2013-02-11 21:26:38 -06:00
|
|
|
set of name bindings with no def?!");
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2012-08-20 14:23:37 -05:00
|
|
|
Some(def) => {
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
// For the two success cases, this lookup can be
|
|
|
|
// considered as not having a private component because
|
|
|
|
// the lookup happened only within the current module.
|
2012-08-17 19:55:34 -05:00
|
|
|
match def.def {
|
2013-11-28 14:22:53 -06:00
|
|
|
def @ DefVariant(..) | def @ DefStruct(..) => {
|
2014-02-11 13:19:18 -06:00
|
|
|
return FoundStructOrEnumVariant(def, LastMod(AllPublic));
|
2012-08-17 19:55:34 -05:00
|
|
|
}
|
rustc: Add `const` globals to the language
This change is an implementation of [RFC 69][rfc] which adds a third kind of
global to the language, `const`. This global is most similar to what the old
`static` was, and if you're unsure about what to use then you should use a
`const`.
The semantics of these three kinds of globals are:
* A `const` does not represent a memory location, but only a value. Constants
are translated as rvalues, which means that their values are directly inlined
at usage location (similar to a #define in C/C++). Constant values are, well,
constant, and can not be modified. Any "modification" is actually a
modification to a local value on the stack rather than the actual constant
itself.
Almost all values are allowed inside constants, whether they have interior
mutability or not. There are a few minor restrictions listed in the RFC, but
they should in general not come up too often.
* A `static` now always represents a memory location (unconditionally). Any
references to the same `static` are actually a reference to the same memory
location. Only values whose types ascribe to `Sync` are allowed in a `static`.
This restriction is in place because many threads may access a `static`
concurrently. Lifting this restriction (and allowing unsafe access) is a
future extension not implemented at this time.
* A `static mut` continues to always represent a memory location. All references
to a `static mut` continue to be `unsafe`.
This is a large breaking change, and many programs will need to be updated
accordingly. A summary of the breaking changes is:
* Statics may no longer be used in patterns. Statics now always represent a
memory location, which can sometimes be modified. To fix code, repurpose the
matched-on-`static` to a `const`.
static FOO: uint = 4;
match n {
FOO => { /* ... */ }
_ => { /* ... */ }
}
change this code to:
const FOO: uint = 4;
match n {
FOO => { /* ... */ }
_ => { /* ... */ }
}
* Statics may no longer refer to other statics by value. Due to statics being
able to change at runtime, allowing them to reference one another could
possibly lead to confusing semantics. If you are in this situation, use a
constant initializer instead. Note, however, that statics may reference other
statics by address, however.
* Statics may no longer be used in constant expressions, such as array lengths.
This is due to the same restrictions as listed above. Use a `const` instead.
[breaking-change]
[rfc]: https://github.com/rust-lang/rfcs/pull/246
2014-10-06 10:17:01 -05:00
|
|
|
def @ DefConst(..) => {
|
2014-02-11 13:19:18 -06:00
|
|
|
return FoundConst(def, LastMod(AllPublic));
|
2012-08-17 19:55:34 -05:00
|
|
|
}
|
rustc: Add `const` globals to the language
This change is an implementation of [RFC 69][rfc] which adds a third kind of
global to the language, `const`. This global is most similar to what the old
`static` was, and if you're unsure about what to use then you should use a
`const`.
The semantics of these three kinds of globals are:
* A `const` does not represent a memory location, but only a value. Constants
are translated as rvalues, which means that their values are directly inlined
at usage location (similar to a #define in C/C++). Constant values are, well,
constant, and can not be modified. Any "modification" is actually a
modification to a local value on the stack rather than the actual constant
itself.
Almost all values are allowed inside constants, whether they have interior
mutability or not. There are a few minor restrictions listed in the RFC, but
they should in general not come up too often.
* A `static` now always represents a memory location (unconditionally). Any
references to the same `static` are actually a reference to the same memory
location. Only values whose types ascribe to `Sync` are allowed in a `static`.
This restriction is in place because many threads may access a `static`
concurrently. Lifting this restriction (and allowing unsafe access) is a
future extension not implemented at this time.
* A `static mut` continues to always represent a memory location. All references
to a `static mut` continue to be `unsafe`.
This is a large breaking change, and many programs will need to be updated
accordingly. A summary of the breaking changes is:
* Statics may no longer be used in patterns. Statics now always represent a
memory location, which can sometimes be modified. To fix code, repurpose the
matched-on-`static` to a `const`.
static FOO: uint = 4;
match n {
FOO => { /* ... */ }
_ => { /* ... */ }
}
change this code to:
const FOO: uint = 4;
match n {
FOO => { /* ... */ }
_ => { /* ... */ }
}
* Statics may no longer refer to other statics by value. Due to statics being
able to change at runtime, allowing them to reference one another could
possibly lead to confusing semantics. If you are in this situation, use a
constant initializer instead. Note, however, that statics may reference other
statics by address, however.
* Statics may no longer be used in constant expressions, such as array lengths.
This is due to the same restrictions as listed above. Use a `const` instead.
[breaking-change]
[rfc]: https://github.com/rust-lang/rfcs/pull/246
2014-10-06 10:17:01 -05:00
|
|
|
DefStatic(..) => {
|
2014-07-13 08:12:47 -05:00
|
|
|
self.resolve_error(span,
|
rustc: Add `const` globals to the language
This change is an implementation of [RFC 69][rfc] which adds a third kind of
global to the language, `const`. This global is most similar to what the old
`static` was, and if you're unsure about what to use then you should use a
`const`.
The semantics of these three kinds of globals are:
* A `const` does not represent a memory location, but only a value. Constants
are translated as rvalues, which means that their values are directly inlined
at usage location (similar to a #define in C/C++). Constant values are, well,
constant, and can not be modified. Any "modification" is actually a
modification to a local value on the stack rather than the actual constant
itself.
Almost all values are allowed inside constants, whether they have interior
mutability or not. There are a few minor restrictions listed in the RFC, but
they should in general not come up too often.
* A `static` now always represents a memory location (unconditionally). Any
references to the same `static` are actually a reference to the same memory
location. Only values whose types ascribe to `Sync` are allowed in a `static`.
This restriction is in place because many threads may access a `static`
concurrently. Lifting this restriction (and allowing unsafe access) is a
future extension not implemented at this time.
* A `static mut` continues to always represent a memory location. All references
to a `static mut` continue to be `unsafe`.
This is a large breaking change, and many programs will need to be updated
accordingly. A summary of the breaking changes is:
* Statics may no longer be used in patterns. Statics now always represent a
memory location, which can sometimes be modified. To fix code, repurpose the
matched-on-`static` to a `const`.
static FOO: uint = 4;
match n {
FOO => { /* ... */ }
_ => { /* ... */ }
}
change this code to:
const FOO: uint = 4;
match n {
FOO => { /* ... */ }
_ => { /* ... */ }
}
* Statics may no longer refer to other statics by value. Due to statics being
able to change at runtime, allowing them to reference one another could
possibly lead to confusing semantics. If you are in this situation, use a
constant initializer instead. Note, however, that statics may reference other
statics by address, however.
* Statics may no longer be used in constant expressions, such as array lengths.
This is due to the same restrictions as listed above. Use a `const` instead.
[breaking-change]
[rfc]: https://github.com/rust-lang/rfcs/pull/246
2014-10-06 10:17:01 -05:00
|
|
|
"static variables cannot be \
|
|
|
|
referenced in a pattern, \
|
|
|
|
use a `const` instead");
|
2014-07-13 08:12:47 -05:00
|
|
|
return BareIdentifierPatternUnresolved;
|
|
|
|
}
|
2012-08-17 19:55:34 -05:00
|
|
|
_ => {
|
2012-10-30 17:53:06 -05:00
|
|
|
return BareIdentifierPatternUnresolved;
|
2012-08-17 19:55:34 -05:00
|
|
|
}
|
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-08-03 21:59:04 -05:00
|
|
|
Indeterminate => {
|
2014-10-09 14:17:22 -05:00
|
|
|
panic!("unexpected indeterminate result");
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2014-06-05 16:37:52 -05:00
|
|
|
Failed(err) => {
|
|
|
|
match err {
|
|
|
|
Some((span, msg)) => {
|
2015-01-07 10:58:31 -06:00
|
|
|
self.resolve_error(span, &format!("failed to resolve: {}",
|
2015-02-20 13:08:14 -06:00
|
|
|
msg));
|
2014-06-05 16:37:52 -05:00
|
|
|
}
|
|
|
|
None => ()
|
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolve bare identifier pattern) failed to find {}",
|
2014-09-30 19:11:34 -05:00
|
|
|
token::get_name(name));
|
2012-10-30 17:53:06 -05:00
|
|
|
return BareIdentifierPatternUnresolved;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-01 12:44:43 -06:00
|
|
|
/// If `check_ribs` is true, checks the local definitions first; i.e.
|
|
|
|
/// doesn't skip straight to the containing module.
|
2015-02-16 22:44:23 -06:00
|
|
|
/// Skips `path_depth` trailing segments, which is also reflected in the
|
|
|
|
/// returned value. See `middle::def::PathResolution` for more info.
|
2013-10-02 07:33:01 -05:00
|
|
|
fn resolve_path(&mut self,
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
id: NodeId,
|
|
|
|
path: &Path,
|
2015-01-31 13:20:24 -06:00
|
|
|
path_depth: usize,
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
namespace: Namespace,
|
2015-02-16 22:44:23 -06:00
|
|
|
check_ribs: bool) -> Option<PathResolution> {
|
2015-01-31 13:20:24 -06:00
|
|
|
let span = path.span;
|
|
|
|
let segments = &path.segments[..path.segments.len()-path_depth];
|
|
|
|
|
2015-02-16 22:44:23 -06:00
|
|
|
let mk_res = |(def, lp)| PathResolution {
|
|
|
|
base_def: def,
|
|
|
|
last_private: lp,
|
|
|
|
depth: path_depth
|
|
|
|
};
|
|
|
|
|
2012-05-22 12:54:12 -05:00
|
|
|
if path.global {
|
2015-02-05 05:20:48 -06:00
|
|
|
let def = self.resolve_crate_relative_path(span, segments, namespace);
|
2015-02-16 22:44:23 -06:00
|
|
|
return def.map(mk_res);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2014-11-28 22:08:30 -06:00
|
|
|
// Try to find a path to an item in a module.
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
let unqualified_def =
|
2015-01-31 13:20:24 -06:00
|
|
|
self.resolve_identifier(segments.last().unwrap().identifier,
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
namespace,
|
|
|
|
check_ribs,
|
2015-01-31 13:20:24 -06:00
|
|
|
span);
|
2013-07-08 10:34:28 -05:00
|
|
|
|
2015-01-31 13:20:24 -06:00
|
|
|
if segments.len() > 1 {
|
|
|
|
let def = self.resolve_module_relative_path(span, segments, namespace);
|
2013-07-08 10:34:28 -05:00
|
|
|
match (def, unqualified_def) {
|
2014-09-07 12:09:06 -05:00
|
|
|
(Some((ref d, _)), Some((ref ud, _))) if *d == *ud => {
|
2014-05-09 20:45:36 -05:00
|
|
|
self.session
|
2014-10-14 13:37:16 -05:00
|
|
|
.add_lint(lint::builtin::UNUSED_QUALIFICATIONS,
|
2015-01-31 13:20:24 -06:00
|
|
|
id, span,
|
2014-05-25 05:17:19 -05:00
|
|
|
"unnecessary qualification".to_string());
|
2013-07-08 10:34:28 -05:00
|
|
|
}
|
|
|
|
_ => ()
|
|
|
|
}
|
2013-08-08 13:38:10 -05:00
|
|
|
|
2015-02-16 22:44:23 -06:00
|
|
|
def.map(mk_res)
|
2015-02-05 05:20:48 -06:00
|
|
|
} else {
|
2015-02-16 22:44:23 -06:00
|
|
|
unqualified_def.map(mk_res)
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-30 19:46:25 -05:00
|
|
|
// resolve a single identifier (used as a varref)
|
2013-10-02 07:33:01 -05:00
|
|
|
fn resolve_identifier(&mut self,
|
2014-11-28 22:09:12 -06:00
|
|
|
identifier: Ident,
|
|
|
|
namespace: Namespace,
|
|
|
|
check_ribs: bool,
|
|
|
|
span: Span)
|
|
|
|
-> Option<(Def, LastPrivate)> {
|
2015-02-05 01:19:07 -06:00
|
|
|
// First, check to see whether the name is a primitive type.
|
|
|
|
if namespace == TypeNS {
|
|
|
|
if let Some(&prim_ty) = self.primitive_type_table
|
|
|
|
.primitive_types
|
|
|
|
.get(&identifier.name) {
|
|
|
|
return Some((DefPrimTy(prim_ty), LastMod(AllPublic)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-05-22 12:54:12 -05:00
|
|
|
if check_ribs {
|
2015-02-05 01:19:07 -06:00
|
|
|
if let Some(def) = self.resolve_identifier_in_local_ribs(identifier,
|
|
|
|
namespace,
|
|
|
|
span) {
|
|
|
|
return Some((def, LastMod(AllPublic)));
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-05 01:19:07 -06:00
|
|
|
self.resolve_item_by_name_in_lexical_scope(identifier.name, namespace)
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2013-02-14 20:37:25 -06:00
|
|
|
// FIXME #4952: Merge me with resolve_name_in_module?
|
2013-10-02 07:33:01 -05:00
|
|
|
fn resolve_definition_of_name_in_module(&mut self,
|
2014-04-14 03:30:59 -05:00
|
|
|
containing_module: Rc<Module>,
|
2014-05-08 16:35:09 -05:00
|
|
|
name: Name,
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
namespace: Namespace)
|
2014-11-28 22:09:12 -06:00
|
|
|
-> NameDefinition {
|
2012-05-22 12:54:12 -05:00
|
|
|
// First, search children.
|
2014-12-30 12:16:42 -06:00
|
|
|
build_reduced_graph::populate_module_if_necessary(self, &containing_module);
|
2013-12-21 17:32:44 -06:00
|
|
|
|
2014-11-06 11:25:16 -06:00
|
|
|
match containing_module.children.borrow().get(&name) {
|
2014-03-20 21:49:20 -05:00
|
|
|
Some(child_name_bindings) => {
|
|
|
|
match child_name_bindings.def_for_namespace(namespace) {
|
|
|
|
Some(def) => {
|
|
|
|
// Found it. Stop the search here.
|
|
|
|
let p = child_name_bindings.defined_in_public_namespace(
|
|
|
|
namespace);
|
|
|
|
let lp = if p {LastMod(AllPublic)} else {
|
2014-05-14 14:31:30 -05:00
|
|
|
LastMod(DependsOn(def.def_id()))
|
2014-03-20 21:49:20 -05:00
|
|
|
};
|
|
|
|
return ChildNameDefinition(def, lp);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2014-03-20 21:49:20 -05:00
|
|
|
None => {}
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
2014-03-20 21:49:20 -05:00
|
|
|
None => {}
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// Next, search import resolutions.
|
2014-11-06 11:25:16 -06:00
|
|
|
match containing_module.import_resolutions.borrow().get(&name) {
|
2014-04-14 03:30:59 -05:00
|
|
|
Some(import_resolution) if import_resolution.is_public => {
|
2014-11-29 15:41:21 -06:00
|
|
|
if let Some(target) = (*import_resolution).target_for_namespace(namespace) {
|
|
|
|
match target.bindings.def_for_namespace(namespace) {
|
|
|
|
Some(def) => {
|
|
|
|
// Found it.
|
|
|
|
let id = import_resolution.id(namespace);
|
|
|
|
// track imports and extern crates as well
|
|
|
|
self.used_imports.insert((id, namespace));
|
2014-11-23 03:29:41 -06:00
|
|
|
self.record_import_use(id, name);
|
2014-11-29 15:41:21 -06:00
|
|
|
match target.target_module.def_id.get() {
|
|
|
|
Some(DefId{krate: kid, ..}) => {
|
|
|
|
self.used_crates.insert(kid);
|
|
|
|
},
|
|
|
|
_ => {}
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2014-11-29 15:41:21 -06:00
|
|
|
return ImportNameDefinition(def, LastMod(AllPublic));
|
|
|
|
}
|
|
|
|
None => {
|
|
|
|
// This can happen with external impls, due to
|
|
|
|
// the imperfect way we read the metadata.
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-11-28 14:22:53 -06:00
|
|
|
Some(..) | None => {} // Continue.
|
2013-03-26 21:53:33 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// Finally, search through external children.
|
|
|
|
if namespace == TypeNS {
|
2014-11-29 15:41:21 -06:00
|
|
|
if let Some(module) = containing_module.external_module_children.borrow()
|
|
|
|
.get(&name).cloned() {
|
|
|
|
if let Some(def_id) = module.def_id.get() {
|
|
|
|
// track used crates
|
|
|
|
self.used_crates.insert(def_id.krate);
|
|
|
|
let lp = if module.is_public {LastMod(AllPublic)} else {
|
|
|
|
LastMod(DependsOn(def_id))
|
|
|
|
};
|
|
|
|
return ChildNameDefinition(DefMod(def_id), lp);
|
2013-03-26 21:53:33 -05:00
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
2013-03-26 21:53:33 -05:00
|
|
|
|
|
|
|
return NoNameDefinition;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2013-06-26 13:16:09 -05:00
|
|
|
// resolve a "module-relative" path, e.g. a::b::c
|
2013-10-02 07:33:01 -05:00
|
|
|
fn resolve_module_relative_path(&mut self,
|
2015-01-31 13:20:24 -06:00
|
|
|
span: Span,
|
|
|
|
segments: &[ast::PathSegment],
|
2014-11-28 22:09:12 -06:00
|
|
|
namespace: Namespace)
|
|
|
|
-> Option<(Def, LastPrivate)> {
|
2015-01-31 13:20:24 -06:00
|
|
|
let module_path = segments.init().iter()
|
|
|
|
.map(|ps| ps.identifier.name)
|
|
|
|
.collect::<Vec<_>>();
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2013-04-12 00:15:30 -05:00
|
|
|
let containing_module;
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
let last_private;
|
2014-04-14 03:30:59 -05:00
|
|
|
let module = self.current_module.clone();
|
|
|
|
match self.resolve_module_path(module,
|
2015-02-18 13:48:57 -06:00
|
|
|
&module_path[..],
|
2013-05-13 18:13:20 -05:00
|
|
|
UseLexicalScope,
|
2015-01-31 13:20:24 -06:00
|
|
|
span,
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
PathSearch) {
|
2014-06-05 16:37:52 -05:00
|
|
|
Failed(err) => {
|
|
|
|
let (span, msg) = match err {
|
|
|
|
Some((span, msg)) => (span, msg),
|
|
|
|
None => {
|
2014-11-28 22:09:12 -06:00
|
|
|
let msg = format!("Use of undeclared type or module `{}`",
|
2015-02-01 20:53:25 -06:00
|
|
|
self.names_to_string(&module_path));
|
2015-01-31 13:20:24 -06:00
|
|
|
(span, msg)
|
2014-06-05 16:37:52 -05:00
|
|
|
}
|
|
|
|
};
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2015-01-07 10:58:31 -06:00
|
|
|
self.resolve_error(span, &format!("failed to resolve. {}",
|
2015-02-20 13:08:14 -06:00
|
|
|
msg));
|
2014-06-05 16:37:52 -05:00
|
|
|
return None;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2014-10-09 14:17:22 -05:00
|
|
|
Indeterminate => panic!("indeterminate unexpected"),
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
Success((resulting_module, resulting_last_private)) => {
|
2012-05-22 12:54:12 -05:00
|
|
|
containing_module = resulting_module;
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
last_private = resulting_last_private;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-31 13:20:24 -06:00
|
|
|
let name = segments.last().unwrap().identifier.name;
|
2014-04-14 03:30:59 -05:00
|
|
|
let def = match self.resolve_definition_of_name_in_module(containing_module.clone(),
|
2014-09-30 19:11:34 -05:00
|
|
|
name,
|
2014-10-14 19:33:20 -05:00
|
|
|
namespace) {
|
2012-08-03 21:59:04 -05:00
|
|
|
NoNameDefinition => {
|
2012-05-22 12:54:12 -05:00
|
|
|
// We failed to resolve the name. Report an error.
|
2012-08-20 14:23:37 -05:00
|
|
|
return None;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
ChildNameDefinition(def, lp) | ImportNameDefinition(def, lp) => {
|
|
|
|
(def, last_private.or(lp))
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2013-06-03 06:31:43 -05:00
|
|
|
};
|
2014-11-29 15:41:21 -06:00
|
|
|
if let Some(DefId{krate: kid, ..}) = containing_module.def_id.get() {
|
|
|
|
self.used_crates.insert(kid);
|
2014-09-11 12:14:43 -05:00
|
|
|
}
|
2013-06-03 06:31:43 -05:00
|
|
|
return Some(def);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2013-03-01 12:44:43 -06:00
|
|
|
/// Invariant: This must be called only during main resolution, not during
|
|
|
|
/// import resolution.
|
2013-10-02 07:33:01 -05:00
|
|
|
fn resolve_crate_relative_path(&mut self,
|
2015-01-31 13:20:24 -06:00
|
|
|
span: Span,
|
|
|
|
segments: &[ast::PathSegment],
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
namespace: Namespace)
|
|
|
|
-> Option<(Def, LastPrivate)> {
|
2015-01-31 13:20:24 -06:00
|
|
|
let module_path = segments.init().iter()
|
|
|
|
.map(|ps| ps.identifier.name)
|
|
|
|
.collect::<Vec<_>>();
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2013-02-04 16:02:01 -06:00
|
|
|
let root_module = self.graph_root.get_module();
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2013-04-12 00:15:30 -05:00
|
|
|
let containing_module;
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
let last_private;
|
2012-08-06 14:34:08 -05:00
|
|
|
match self.resolve_module_path_from_root(root_module,
|
2015-02-18 13:48:57 -06:00
|
|
|
&module_path[..],
|
2012-12-23 16:41:37 -06:00
|
|
|
0,
|
2015-01-31 13:20:24 -06:00
|
|
|
span,
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
PathSearch,
|
2014-02-11 13:19:18 -06:00
|
|
|
LastMod(AllPublic)) {
|
2014-06-05 16:37:52 -05:00
|
|
|
Failed(err) => {
|
|
|
|
let (span, msg) = match err {
|
|
|
|
Some((span, msg)) => (span, msg),
|
|
|
|
None => {
|
|
|
|
let msg = format!("Use of undeclared module `::{}`",
|
2015-02-18 13:48:57 -06:00
|
|
|
self.names_to_string(&module_path[..]));
|
2015-01-31 13:20:24 -06:00
|
|
|
(span, msg)
|
2014-06-05 16:37:52 -05:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2015-01-07 10:58:31 -06:00
|
|
|
self.resolve_error(span, &format!("failed to resolve. {}",
|
2015-02-20 13:08:14 -06:00
|
|
|
msg));
|
2012-08-20 14:23:37 -05:00
|
|
|
return None;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2012-08-03 21:59:04 -05:00
|
|
|
Indeterminate => {
|
2014-10-09 14:17:22 -05:00
|
|
|
panic!("indeterminate unexpected");
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
Success((resulting_module, resulting_last_private)) => {
|
2012-05-22 12:54:12 -05:00
|
|
|
containing_module = resulting_module;
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
last_private = resulting_last_private;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-31 13:20:24 -06:00
|
|
|
let name = segments.last().unwrap().identifier.name;
|
2012-08-06 14:34:08 -05:00
|
|
|
match self.resolve_definition_of_name_in_module(containing_module,
|
2012-12-23 16:41:37 -06:00
|
|
|
name,
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
namespace) {
|
2012-08-03 21:59:04 -05:00
|
|
|
NoNameDefinition => {
|
2012-05-22 12:54:12 -05:00
|
|
|
// We failed to resolve the name. Report an error.
|
2012-08-20 14:23:37 -05:00
|
|
|
return None;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
ChildNameDefinition(def, lp) | ImportNameDefinition(def, lp) => {
|
|
|
|
return Some((def, last_private.or(lp)));
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-02 07:33:01 -05:00
|
|
|
fn resolve_identifier_in_local_ribs(&mut self,
|
2014-11-28 22:09:12 -06:00
|
|
|
ident: Ident,
|
|
|
|
namespace: Namespace,
|
|
|
|
span: Span)
|
|
|
|
-> Option<Def> {
|
2012-05-22 12:54:12 -05:00
|
|
|
// Check the local set of ribs.
|
2014-03-20 21:49:20 -05:00
|
|
|
let search_result = match namespace {
|
2012-08-03 21:59:04 -05:00
|
|
|
ValueNS => {
|
2014-02-24 14:47:19 -06:00
|
|
|
let renamed = mtwt::resolve(ident);
|
2015-02-01 20:53:25 -06:00
|
|
|
self.search_ribs(&self.value_ribs, renamed, span)
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2012-08-03 21:59:04 -05:00
|
|
|
TypeNS => {
|
2013-06-26 17:56:13 -05:00
|
|
|
let name = ident.name;
|
2015-02-20 13:08:14 -06:00
|
|
|
self.search_ribs(&self.type_ribs, name, span)
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2014-03-20 21:49:20 -05:00
|
|
|
};
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2013-03-20 00:17:42 -05:00
|
|
|
match search_result {
|
2013-08-31 11:13:04 -05:00
|
|
|
Some(DlDef(def)) => {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving path in local ribs) resolved `{}` to \
|
2014-12-20 02:09:35 -06:00
|
|
|
local: {:?}",
|
2014-02-13 23:07:09 -06:00
|
|
|
token::get_ident(ident),
|
2012-08-22 19:24:52 -05:00
|
|
|
def);
|
2015-02-05 01:19:07 -06:00
|
|
|
Some(def)
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2013-08-31 11:13:04 -05:00
|
|
|
Some(DlField) | Some(DlImpl(_)) | None => {
|
2015-02-05 01:19:07 -06:00
|
|
|
None
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-09-30 19:11:34 -05:00
|
|
|
fn resolve_item_by_name_in_lexical_scope(&mut self,
|
|
|
|
name: Name,
|
|
|
|
namespace: Namespace)
|
|
|
|
-> Option<(Def, LastPrivate)> {
|
2012-05-22 12:54:12 -05:00
|
|
|
// Check the items.
|
2014-04-14 03:30:59 -05:00
|
|
|
let module = self.current_module.clone();
|
|
|
|
match self.resolve_item_in_lexical_scope(module,
|
2014-09-30 19:11:34 -05:00
|
|
|
name,
|
2014-05-16 17:44:14 -05:00
|
|
|
namespace) {
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
Success((target, _)) => {
|
2012-08-06 14:34:08 -05:00
|
|
|
match (*target.bindings).def_for_namespace(namespace) {
|
2012-08-20 14:23:37 -05:00
|
|
|
None => {
|
2012-10-15 16:56:42 -05:00
|
|
|
// This can happen if we were looking for a type and
|
|
|
|
// found a module instead. Modules don't have defs.
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving item path by identifier in lexical \
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
scope) failed to resolve {} after success...",
|
2014-09-30 19:11:34 -05:00
|
|
|
token::get_name(name));
|
2012-10-15 16:56:42 -05:00
|
|
|
return None;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2012-08-20 14:23:37 -05:00
|
|
|
Some(def) => {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving item path in lexical scope) \
|
2013-09-28 00:38:08 -05:00
|
|
|
resolved `{}` to item",
|
2014-09-30 19:11:34 -05:00
|
|
|
token::get_name(name));
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
// This lookup is "all public" because it only searched
|
|
|
|
// for one identifier in the current module (couldn't
|
|
|
|
// have passed through reexports or anything like that.
|
2014-02-11 13:19:18 -06:00
|
|
|
return Some((def, LastMod(AllPublic)));
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-08-03 21:59:04 -05:00
|
|
|
Indeterminate => {
|
2014-10-09 14:17:22 -05:00
|
|
|
panic!("unexpected indeterminate result");
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2014-06-05 16:37:52 -05:00
|
|
|
Failed(err) => {
|
|
|
|
match err {
|
|
|
|
Some((span, msg)) =>
|
2015-01-07 10:58:31 -06:00
|
|
|
self.resolve_error(span, &format!("failed to resolve. {}",
|
2015-02-20 13:08:14 -06:00
|
|
|
msg)),
|
2014-06-05 16:37:52 -05:00
|
|
|
None => ()
|
|
|
|
}
|
|
|
|
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving item path by identifier in lexical scope) \
|
2014-09-30 19:11:34 -05:00
|
|
|
failed to resolve {}", token::get_name(name));
|
2012-08-20 14:23:37 -05:00
|
|
|
return None;
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-08 19:26:43 -06:00
|
|
|
fn with_no_errors<T, F>(&mut self, f: F) -> T where
|
|
|
|
F: FnOnce(&mut Resolver) -> T,
|
|
|
|
{
|
2013-08-13 19:54:14 -05:00
|
|
|
self.emit_errors = false;
|
2013-09-26 21:10:16 -05:00
|
|
|
let rs = f(self);
|
2013-08-13 19:54:14 -05:00
|
|
|
self.emit_errors = true;
|
|
|
|
rs
|
|
|
|
}
|
|
|
|
|
2014-12-10 21:46:38 -06:00
|
|
|
fn resolve_error(&self, span: Span, s: &str) {
|
2013-08-13 19:54:14 -05:00
|
|
|
if self.emit_errors {
|
2014-12-10 21:46:38 -06:00
|
|
|
self.session.span_err(span, s);
|
2013-08-13 19:54:14 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-08 16:35:09 -05:00
|
|
|
fn find_fallback_in_self_type(&mut self, name: Name) -> FallbackSuggestion {
|
2014-05-19 16:27:03 -05:00
|
|
|
fn extract_path_and_node_id(t: &Ty, allow: FallbackChecks)
|
|
|
|
-> Option<(Path, NodeId, FallbackChecks)> {
|
|
|
|
match t.node {
|
2015-02-17 11:29:13 -06:00
|
|
|
TyPath(None, ref path) => Some((path.clone(), t.id, allow)),
|
2014-09-07 12:09:06 -05:00
|
|
|
TyPtr(ref mut_ty) => extract_path_and_node_id(&*mut_ty.ty, OnlyTraitAndStatics),
|
|
|
|
TyRptr(_, ref mut_ty) => extract_path_and_node_id(&*mut_ty.ty, allow),
|
2014-05-19 16:27:03 -05:00
|
|
|
// This doesn't handle the remaining `Ty` variants as they are not
|
|
|
|
// that commonly the self_type, it might be interesting to provide
|
|
|
|
// support for those in future.
|
|
|
|
_ => None,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-09-30 19:11:34 -05:00
|
|
|
fn get_module(this: &mut Resolver, span: Span, name_path: &[ast::Name])
|
2014-05-08 16:35:09 -05:00
|
|
|
-> Option<Rc<Module>> {
|
|
|
|
let root = this.current_module.clone();
|
2014-09-30 19:11:34 -05:00
|
|
|
let last_name = name_path.last().unwrap();
|
2014-05-08 16:35:09 -05:00
|
|
|
|
2014-09-30 19:11:34 -05:00
|
|
|
if name_path.len() == 1 {
|
2014-11-06 11:25:16 -06:00
|
|
|
match this.primitive_type_table.primitive_types.get(last_name) {
|
2014-05-08 16:35:09 -05:00
|
|
|
Some(_) => None,
|
|
|
|
None => {
|
2014-11-06 11:25:16 -06:00
|
|
|
match this.current_module.children.borrow().get(last_name) {
|
2014-05-08 16:35:09 -05:00
|
|
|
Some(child) => child.get_module_if_available(),
|
|
|
|
None => None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
match this.resolve_module_path(root,
|
2015-02-18 13:48:57 -06:00
|
|
|
&name_path[..],
|
2014-05-08 16:35:09 -05:00
|
|
|
UseLexicalScope,
|
|
|
|
span,
|
|
|
|
PathSearch) {
|
|
|
|
Success((module, _)) => Some(module),
|
|
|
|
_ => None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-11 01:32:25 -06:00
|
|
|
fn is_static_method(this: &Resolver, did: DefId) -> bool {
|
|
|
|
if did.krate == ast::LOCAL_CRATE {
|
|
|
|
let explicit_self = match this.ast_map.get(did.node) {
|
|
|
|
ast_map::NodeTraitItem(m) => match *m {
|
|
|
|
ast::RequiredMethod(ref m) => &m.explicit_self,
|
|
|
|
ast::ProvidedMethod(ref m) => m.pe_explicit_self(),
|
|
|
|
_ => return false
|
|
|
|
},
|
|
|
|
ast_map::NodeImplItem(m) => match *m {
|
|
|
|
ast::MethodImplItem(ref m) => m.pe_explicit_self(),
|
|
|
|
_ => return false
|
|
|
|
},
|
|
|
|
_ => return false
|
|
|
|
};
|
|
|
|
explicit_self.node == ast::SelfStatic
|
|
|
|
} else {
|
|
|
|
csearch::is_static_method(&this.session.cstore, did)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-19 16:27:03 -05:00
|
|
|
let (path, node_id, allowed) = match self.current_self_type {
|
|
|
|
Some(ref ty) => match extract_path_and_node_id(ty, Everything) {
|
|
|
|
Some(x) => x,
|
|
|
|
None => return NoSuggestion,
|
2014-05-08 16:35:09 -05:00
|
|
|
},
|
|
|
|
None => return NoSuggestion,
|
|
|
|
};
|
|
|
|
|
2014-05-19 16:27:03 -05:00
|
|
|
if allowed == Everything {
|
|
|
|
// Look for a field with the same name in the current self_type.
|
2015-02-16 22:44:23 -06:00
|
|
|
match self.def_map.borrow().get(&node_id).map(|d| d.full_def()) {
|
|
|
|
Some(DefTy(did, _)) |
|
|
|
|
Some(DefStruct(did)) |
|
|
|
|
Some(DefVariant(_, did, _)) => match self.structs.get(&did) {
|
2014-05-19 16:27:03 -05:00
|
|
|
None => {}
|
|
|
|
Some(fields) => {
|
|
|
|
if fields.iter().any(|&field_name| name == field_name) {
|
|
|
|
return Field;
|
|
|
|
}
|
2014-05-08 16:35:09 -05:00
|
|
|
}
|
2014-05-19 16:27:03 -05:00
|
|
|
},
|
|
|
|
_ => {} // Self type didn't resolve properly
|
|
|
|
}
|
2014-05-08 16:35:09 -05:00
|
|
|
}
|
|
|
|
|
2014-09-30 19:11:34 -05:00
|
|
|
let name_path = path.segments.iter().map(|seg| seg.identifier.name).collect::<Vec<_>>();
|
2014-05-08 16:35:09 -05:00
|
|
|
|
|
|
|
// Look for a method in the current self type's impl module.
|
2015-02-11 01:32:25 -06:00
|
|
|
if let Some(module) = get_module(self, path.span, &name_path) {
|
|
|
|
if let Some(binding) = module.children.borrow().get(&name) {
|
|
|
|
if let Some(DefMethod(did, _)) = binding.def_for_namespace(ValueNS) {
|
|
|
|
if is_static_method(self, did) {
|
|
|
|
return StaticMethod(self.path_names_to_string(&path, 0))
|
|
|
|
}
|
|
|
|
if self.current_trait_ref.is_some() {
|
|
|
|
return TraitItem;
|
|
|
|
} else if allowed == Everything {
|
|
|
|
return Method;
|
2014-05-08 16:35:09 -05:00
|
|
|
}
|
|
|
|
}
|
2015-02-11 01:32:25 -06:00
|
|
|
}
|
2014-05-08 16:35:09 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// Look for a method in the current trait.
|
2015-02-11 01:32:25 -06:00
|
|
|
if let Some((trait_did, ref trait_ref)) = self.current_trait_ref {
|
|
|
|
if let Some(&did) = self.trait_item_map.get(&(name, trait_did)) {
|
|
|
|
if is_static_method(self, did) {
|
|
|
|
return TraitMethod(self.path_names_to_string(&trait_ref.path, 0));
|
|
|
|
} else {
|
|
|
|
return TraitItem;
|
2014-05-08 16:35:09 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
NoSuggestion
|
|
|
|
}
|
|
|
|
|
2013-11-19 15:22:03 -06:00
|
|
|
fn find_best_match_for_name(&mut self, name: &str, max_distance: uint)
|
2014-05-22 18:57:53 -05:00
|
|
|
-> Option<String> {
|
2013-03-16 13:11:31 -05:00
|
|
|
let this = &mut *self;
|
|
|
|
|
2014-03-04 12:02:49 -06:00
|
|
|
let mut maybes: Vec<token::InternedString> = Vec::new();
|
|
|
|
let mut values: Vec<uint> = Vec::new();
|
2013-02-23 02:22:51 -06:00
|
|
|
|
2014-09-29 18:06:13 -05:00
|
|
|
for rib in this.value_ribs.iter().rev() {
|
2015-01-31 11:20:46 -06:00
|
|
|
for (&k, _) in &rib.bindings {
|
2014-02-13 23:07:09 -06:00
|
|
|
maybes.push(token::get_name(k));
|
2015-02-09 18:33:19 -06:00
|
|
|
values.push(usize::MAX);
|
2013-02-23 02:22:51 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
let mut smallest = 0;
|
2014-01-31 14:25:11 -06:00
|
|
|
for (i, other) in maybes.iter().enumerate() {
|
2015-02-04 14:48:12 -06:00
|
|
|
values[i] = lev_distance(name, &other);
|
2013-02-23 02:22:51 -06:00
|
|
|
|
2014-10-15 01:05:01 -05:00
|
|
|
if values[i] <= values[smallest] {
|
2013-02-23 02:22:51 -06:00
|
|
|
smallest = i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-14 04:52:12 -05:00
|
|
|
if values.len() > 0 &&
|
2015-02-09 18:33:19 -06:00
|
|
|
values[smallest] != usize::MAX &&
|
2014-10-15 01:05:01 -05:00
|
|
|
values[smallest] < name.len() + 2 &&
|
|
|
|
values[smallest] <= max_distance &&
|
2015-02-20 13:08:14 -06:00
|
|
|
name != &maybes[smallest][..] {
|
2013-02-23 02:22:51 -06:00
|
|
|
|
2015-02-03 17:48:39 -06:00
|
|
|
Some(maybes[smallest].to_string())
|
2013-02-23 02:22:51 -06:00
|
|
|
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-06 06:00:46 -06:00
|
|
|
fn resolve_expr(&mut self, expr: &Expr) {
|
2012-08-17 18:53:07 -05:00
|
|
|
// First, record candidate traits for this expression if it could
|
|
|
|
// result in the invocation of a method call.
|
2012-07-11 17:00:40 -05:00
|
|
|
|
|
|
|
self.record_candidate_traits_for_expr_if_necessary(expr);
|
|
|
|
|
2012-05-22 12:54:12 -05:00
|
|
|
// Next, resolve the node.
|
2012-08-06 14:34:08 -05:00
|
|
|
match expr.node {
|
2015-02-17 11:29:13 -06:00
|
|
|
// `<T>::a::b::c` is resolved by typeck alone.
|
|
|
|
ExprPath(Some(ast::QSelf { position: 0, .. }), ref path) => {
|
|
|
|
let method_name = path.segments.last().unwrap().identifier.name;
|
|
|
|
let traits = self.search_for_traits_containing_method(method_name);
|
|
|
|
self.trait_map.insert(expr.id, traits);
|
|
|
|
visit::walk_expr(self, expr);
|
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2015-02-17 11:29:13 -06:00
|
|
|
ExprPath(ref maybe_qself, ref path) => {
|
|
|
|
let max_assoc_types = if let Some(ref qself) = *maybe_qself {
|
2015-02-05 01:19:07 -06:00
|
|
|
// Make sure the trait is valid.
|
2015-02-05 05:20:48 -06:00
|
|
|
let _ = self.resolve_trait_reference(expr.id, path, 1);
|
2015-02-17 11:29:13 -06:00
|
|
|
path.segments.len() - qself.position
|
2015-02-11 01:33:49 -06:00
|
|
|
} else {
|
|
|
|
path.segments.len()
|
|
|
|
};
|
|
|
|
|
2015-02-16 22:44:23 -06:00
|
|
|
let mut resolution = self.with_no_errors(|this| {
|
2015-02-11 01:33:49 -06:00
|
|
|
this.resolve_path(expr.id, path, 0, ValueNS, true)
|
|
|
|
});
|
|
|
|
for depth in 1..max_assoc_types {
|
2015-02-16 22:44:23 -06:00
|
|
|
if resolution.is_some() {
|
2015-02-11 01:33:49 -06:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
self.with_no_errors(|this| {
|
2015-02-16 22:44:23 -06:00
|
|
|
resolution = this.resolve_path(expr.id, path, depth, TypeNS, true);
|
2015-02-11 01:33:49 -06:00
|
|
|
});
|
|
|
|
}
|
2015-02-16 22:44:23 -06:00
|
|
|
if let Some(DefMod(_)) = resolution.map(|r| r.base_def) {
|
2015-02-11 01:33:49 -06:00
|
|
|
// A module is not a valid type or value.
|
2015-02-16 22:44:23 -06:00
|
|
|
resolution = None;
|
2015-01-31 13:20:24 -06:00
|
|
|
}
|
2015-01-30 02:09:44 -06:00
|
|
|
|
2012-05-22 12:54:12 -05:00
|
|
|
// This is a local path in the value namespace. Walk through
|
|
|
|
// scopes looking for it.
|
2015-02-16 22:44:23 -06:00
|
|
|
if let Some(path_res) = resolution {
|
2014-12-10 01:11:19 -06:00
|
|
|
// Check if struct variant
|
2015-02-16 22:44:23 -06:00
|
|
|
if let DefVariant(_, _, true) = path_res.base_def {
|
2015-01-31 13:20:24 -06:00
|
|
|
let path_name = self.path_names_to_string(path, 0);
|
2014-12-10 01:11:19 -06:00
|
|
|
self.resolve_error(expr.span,
|
2015-02-01 20:53:25 -06:00
|
|
|
&format!("`{}` is a struct variant name, but \
|
|
|
|
this expression \
|
|
|
|
uses it like a function name",
|
|
|
|
path_name));
|
2014-12-10 01:11:19 -06:00
|
|
|
|
|
|
|
self.session.span_help(expr.span,
|
2015-02-01 20:53:25 -06:00
|
|
|
&format!("Did you mean to write: \
|
|
|
|
`{} {{ /* fields */ }}`?",
|
|
|
|
path_name));
|
2015-02-16 22:44:23 -06:00
|
|
|
} else {
|
2012-05-22 12:54:12 -05:00
|
|
|
// Write the result into the def map.
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(resolving expr) resolved `{}`",
|
2015-01-31 13:20:24 -06:00
|
|
|
self.path_names_to_string(path, 0));
|
2014-09-30 19:11:34 -05:00
|
|
|
|
2015-02-11 01:33:49 -06:00
|
|
|
// Partial resolutions will need the set of traits in scope,
|
|
|
|
// so they can be completed during typeck.
|
2015-02-16 22:44:23 -06:00
|
|
|
if path_res.depth != 0 {
|
2015-02-11 01:33:49 -06:00
|
|
|
let method_name = path.segments.last().unwrap().identifier.name;
|
|
|
|
let traits = self.search_for_traits_containing_method(method_name);
|
|
|
|
self.trait_map.insert(expr.id, traits);
|
|
|
|
}
|
|
|
|
|
2015-02-16 22:44:23 -06:00
|
|
|
self.record_def(expr.id, path_res);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2015-02-16 22:44:23 -06:00
|
|
|
} else {
|
|
|
|
// Be helpful if the name refers to a struct
|
|
|
|
// (The pattern matching def_tys where the id is in self.structs
|
|
|
|
// matches on regular structs while excluding tuple- and enum-like
|
|
|
|
// structs, which wouldn't result in this error.)
|
|
|
|
let path_name = self.path_names_to_string(path, 0);
|
|
|
|
let type_res = self.with_no_errors(|this| {
|
|
|
|
this.resolve_path(expr.id, path, 0, TypeNS, false)
|
|
|
|
});
|
|
|
|
match type_res.map(|r| r.base_def) {
|
|
|
|
Some(DefTy(struct_id, _))
|
|
|
|
if self.structs.contains_key(&struct_id) => {
|
|
|
|
self.resolve_error(expr.span,
|
|
|
|
&format!("`{}` is a structure name, but \
|
|
|
|
this expression \
|
|
|
|
uses it like a function name",
|
|
|
|
path_name));
|
|
|
|
|
|
|
|
self.session.span_help(expr.span,
|
|
|
|
&format!("Did you mean to write: \
|
|
|
|
`{} {{ /* fields */ }}`?",
|
|
|
|
path_name));
|
2014-05-08 16:35:09 -05:00
|
|
|
|
2015-02-16 22:44:23 -06:00
|
|
|
}
|
|
|
|
_ => {
|
|
|
|
// Keep reporting some errors even if they're ignored above.
|
|
|
|
self.resolve_path(expr.id, path, 0, ValueNS, true);
|
|
|
|
|
|
|
|
let mut method_scope = false;
|
|
|
|
self.value_ribs.iter().rev().all(|rib| {
|
|
|
|
method_scope = match rib.kind {
|
|
|
|
MethodRibKind => true,
|
|
|
|
ItemRibKind | ConstantItemRibKind => false,
|
|
|
|
_ => return true, // Keep advancing
|
|
|
|
};
|
|
|
|
false // Stop advancing
|
|
|
|
});
|
2014-05-08 16:35:09 -05:00
|
|
|
|
2015-02-16 22:44:23 -06:00
|
|
|
if method_scope && &token::get_name(self.self_name)[..]
|
|
|
|
== path_name {
|
2014-05-16 12:45:16 -05:00
|
|
|
self.resolve_error(
|
|
|
|
expr.span,
|
2015-02-16 22:44:23 -06:00
|
|
|
"`self` is not available \
|
|
|
|
in a static method. Maybe a \
|
|
|
|
`self` argument is missing?");
|
|
|
|
} else {
|
|
|
|
let last_name = path.segments.last().unwrap().identifier.name;
|
|
|
|
let mut msg = match self.find_fallback_in_self_type(last_name) {
|
|
|
|
NoSuggestion => {
|
|
|
|
// limit search to 5 to reduce the number
|
|
|
|
// of stupid suggestions
|
|
|
|
self.find_best_match_for_name(&path_name, 5)
|
|
|
|
.map_or("".to_string(),
|
|
|
|
|x| format!("`{}`", x))
|
|
|
|
}
|
|
|
|
Field => format!("`self.{}`", path_name),
|
|
|
|
Method |
|
|
|
|
TraitItem =>
|
|
|
|
format!("to call `self.{}`", path_name),
|
|
|
|
TraitMethod(path_str) |
|
|
|
|
StaticMethod(path_str) =>
|
|
|
|
format!("to call `{}::{}`", path_str, path_name)
|
|
|
|
};
|
|
|
|
|
|
|
|
if msg.len() > 0 {
|
|
|
|
msg = format!(". Did you mean {}?", msg)
|
2014-05-08 16:35:09 -05:00
|
|
|
}
|
2015-02-16 22:44:23 -06:00
|
|
|
|
|
|
|
self.resolve_error(
|
|
|
|
expr.span,
|
|
|
|
&format!("unresolved name `{}`{}",
|
|
|
|
path_name, msg));
|
2014-05-08 16:35:09 -05:00
|
|
|
}
|
2012-08-22 13:40:42 -05:00
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-09-12 05:10:30 -05:00
|
|
|
visit::walk_expr(self, expr);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2013-09-01 20:45:37 -05:00
|
|
|
ExprStruct(ref path, _, _) => {
|
2014-07-04 18:45:47 -05:00
|
|
|
// Resolve the path to the structure it goes to. We don't
|
|
|
|
// check to ensure that the path is actually a structure; that
|
|
|
|
// is checked later during typeck.
|
2015-01-31 13:20:24 -06:00
|
|
|
match self.resolve_path(expr.id, path, 0, TypeNS, false) {
|
2014-07-04 18:45:47 -05:00
|
|
|
Some(definition) => self.record_def(expr.id, definition),
|
2015-02-05 01:19:07 -06:00
|
|
|
None => {
|
|
|
|
debug!("(resolving expression) didn't find struct def",);
|
2013-09-28 00:38:08 -05:00
|
|
|
let msg = format!("`{}` does not name a structure",
|
2015-01-31 13:20:24 -06:00
|
|
|
self.path_names_to_string(path, 0));
|
2015-02-18 13:48:57 -06:00
|
|
|
self.resolve_error(path.span, &msg[..]);
|
2012-07-23 20:44:59 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-09-12 05:10:30 -05:00
|
|
|
visit::walk_expr(self, expr);
|
2012-07-23 20:44:59 -05:00
|
|
|
}
|
|
|
|
|
2014-07-25 19:12:51 -05:00
|
|
|
ExprLoop(_, Some(label)) | ExprWhile(_, _, Some(label)) => {
|
2013-11-21 17:42:55 -06:00
|
|
|
self.with_label_rib(|this| {
|
2013-09-26 21:10:16 -05:00
|
|
|
let def_like = DlDef(DefLabel(expr.id));
|
2014-03-20 21:49:20 -05:00
|
|
|
|
2013-12-21 15:58:11 -06:00
|
|
|
{
|
2014-09-29 18:06:13 -05:00
|
|
|
let rib = this.label_ribs.last_mut().unwrap();
|
2014-02-24 14:47:19 -06:00
|
|
|
let renamed = mtwt::resolve(label);
|
2014-09-29 18:06:13 -05:00
|
|
|
rib.bindings.insert(renamed, def_like);
|
2013-12-21 15:58:11 -06:00
|
|
|
}
|
2012-08-14 21:20:56 -05:00
|
|
|
|
2014-09-12 05:10:30 -05:00
|
|
|
visit::walk_expr(this, expr);
|
2013-11-21 17:42:55 -06:00
|
|
|
})
|
2012-08-14 21:20:56 -05:00
|
|
|
}
|
|
|
|
|
2013-09-01 20:45:37 -05:00
|
|
|
ExprBreak(Some(label)) | ExprAgain(Some(label)) => {
|
2014-02-24 14:47:19 -06:00
|
|
|
let renamed = mtwt::resolve(label);
|
2014-12-26 05:08:00 -06:00
|
|
|
match self.search_label(renamed) {
|
2014-05-16 12:45:16 -05:00
|
|
|
None => {
|
|
|
|
self.resolve_error(
|
|
|
|
expr.span,
|
2015-01-07 10:58:31 -06:00
|
|
|
&format!("use of undeclared label `{}`",
|
2015-02-20 13:08:14 -06:00
|
|
|
token::get_ident(label)))
|
2014-05-16 12:45:16 -05:00
|
|
|
}
|
2013-09-01 20:45:37 -05:00
|
|
|
Some(DlDef(def @ DefLabel(_))) => {
|
2014-02-11 13:19:18 -06:00
|
|
|
// Since this def is a label, it is never read.
|
2015-02-16 22:44:23 -06:00
|
|
|
self.record_def(expr.id, PathResolution {
|
|
|
|
base_def: def,
|
|
|
|
last_private: LastMod(AllPublic),
|
|
|
|
depth: 0
|
|
|
|
})
|
2013-05-10 17:15:06 -05:00
|
|
|
}
|
|
|
|
Some(_) => {
|
2012-08-14 21:20:56 -05:00
|
|
|
self.session.span_bug(expr.span,
|
2013-05-19 00:07:44 -05:00
|
|
|
"label wasn't mapped to a \
|
|
|
|
label def!")
|
2013-05-10 17:15:06 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-08-03 21:59:04 -05:00
|
|
|
_ => {
|
2014-09-12 05:10:30 -05:00
|
|
|
visit::walk_expr(self, expr);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-06 06:00:46 -06:00
|
|
|
fn record_candidate_traits_for_expr_if_necessary(&mut self, expr: &Expr) {
|
2012-08-06 14:34:08 -05:00
|
|
|
match expr.node {
|
2014-11-23 05:14:35 -06:00
|
|
|
ExprField(_, ident) => {
|
2013-06-01 17:31:56 -05:00
|
|
|
// FIXME(#6890): Even though you can't treat a method like a
|
|
|
|
// field, we need to add any trait methods we find that match
|
|
|
|
// the field name so that we can do some nice error reporting
|
|
|
|
// later on in typeck.
|
2014-06-13 16:56:42 -05:00
|
|
|
let traits = self.search_for_traits_containing_method(ident.node.name);
|
2014-02-24 02:36:24 -06:00
|
|
|
self.trait_map.insert(expr.id, traits);
|
2012-07-11 17:00:40 -05:00
|
|
|
}
|
2014-02-26 08:06:45 -06:00
|
|
|
ExprMethodCall(ident, _, _) => {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(recording candidate traits for expr) recording \
|
2013-09-28 00:38:08 -05:00
|
|
|
traits for {}",
|
2013-06-18 11:39:16 -05:00
|
|
|
expr.id);
|
2014-04-23 16:19:23 -05:00
|
|
|
let traits = self.search_for_traits_containing_method(ident.node.name);
|
2014-02-24 02:36:24 -06:00
|
|
|
self.trait_map.insert(expr.id, traits);
|
2012-11-30 13:18:25 -06:00
|
|
|
}
|
2012-07-27 21:32:42 -05:00
|
|
|
_ => {
|
2012-07-11 17:00:40 -05:00
|
|
|
// Nothing to do.
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-22 11:06:43 -05:00
|
|
|
fn search_for_traits_containing_method(&mut self, name: Name) -> Vec<DefId> {
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("(searching for traits containing method) looking for '{}'",
|
2014-04-22 11:06:43 -05:00
|
|
|
token::get_name(name));
|
|
|
|
|
|
|
|
fn add_trait_info(found_traits: &mut Vec<DefId>,
|
|
|
|
trait_def_id: DefId,
|
|
|
|
name: Name) {
|
|
|
|
debug!("(adding trait info) found trait {}:{} for method '{}'",
|
|
|
|
trait_def_id.krate,
|
|
|
|
trait_def_id.node,
|
|
|
|
token::get_name(name));
|
|
|
|
found_traits.push(trait_def_id);
|
|
|
|
}
|
2012-10-08 14:39:30 -05:00
|
|
|
|
2014-03-04 12:02:49 -06:00
|
|
|
let mut found_traits = Vec::new();
|
2014-04-14 03:30:59 -05:00
|
|
|
let mut search_module = self.current_module.clone();
|
2014-04-22 11:06:43 -05:00
|
|
|
loop {
|
|
|
|
// Look for the current trait.
|
2014-05-08 16:35:09 -05:00
|
|
|
match self.current_trait_ref {
|
|
|
|
Some((trait_def_id, _)) => {
|
2014-09-29 18:06:13 -05:00
|
|
|
if self.trait_item_map.contains_key(&(name, trait_def_id)) {
|
2014-05-08 16:35:09 -05:00
|
|
|
add_trait_info(&mut found_traits, trait_def_id, name);
|
2012-07-11 17:00:40 -05:00
|
|
|
}
|
|
|
|
}
|
2014-05-08 16:35:09 -05:00
|
|
|
None => {} // Nothing to do.
|
2014-04-22 11:06:43 -05:00
|
|
|
}
|
2012-07-11 17:00:40 -05:00
|
|
|
|
2014-04-22 11:06:43 -05:00
|
|
|
// Look for trait children.
|
2014-12-30 12:16:42 -06:00
|
|
|
build_reduced_graph::populate_module_if_necessary(self, &search_module);
|
2013-12-21 17:32:44 -06:00
|
|
|
|
2014-04-22 11:06:43 -05:00
|
|
|
{
|
2015-01-31 11:20:46 -06:00
|
|
|
for (_, child_names) in &*search_module.children.borrow() {
|
2014-01-06 18:48:13 -06:00
|
|
|
let def = match child_names.def_for_namespace(TypeNS) {
|
|
|
|
Some(def) => def,
|
|
|
|
None => continue
|
|
|
|
};
|
|
|
|
let trait_def_id = match def {
|
2015-02-23 23:45:34 -06:00
|
|
|
DefTrait(trait_def_id) => trait_def_id,
|
2014-01-06 18:48:13 -06:00
|
|
|
_ => continue,
|
|
|
|
};
|
2014-09-29 18:06:13 -05:00
|
|
|
if self.trait_item_map.contains_key(&(name, trait_def_id)) {
|
2014-04-22 11:06:43 -05:00
|
|
|
add_trait_info(&mut found_traits, trait_def_id, name);
|
2012-07-11 17:00:40 -05:00
|
|
|
}
|
|
|
|
}
|
2014-04-22 11:06:43 -05:00
|
|
|
}
|
2012-07-11 17:00:40 -05:00
|
|
|
|
2014-04-22 11:06:43 -05:00
|
|
|
// Look for imports.
|
2015-01-31 11:20:46 -06:00
|
|
|
for (_, import) in &*search_module.import_resolutions.borrow() {
|
2014-04-22 11:06:43 -05:00
|
|
|
let target = match import.target_for_namespace(TypeNS) {
|
|
|
|
None => continue,
|
|
|
|
Some(target) => target,
|
|
|
|
};
|
|
|
|
let did = match target.bindings.def_for_namespace(TypeNS) {
|
2015-02-23 23:45:34 -06:00
|
|
|
Some(DefTrait(trait_def_id)) => trait_def_id,
|
2014-04-22 11:06:43 -05:00
|
|
|
Some(..) | None => continue,
|
|
|
|
};
|
2014-09-29 18:06:13 -05:00
|
|
|
if self.trait_item_map.contains_key(&(name, did)) {
|
2014-04-22 11:06:43 -05:00
|
|
|
add_trait_info(&mut found_traits, did, name);
|
2014-11-23 03:29:41 -06:00
|
|
|
let id = import.type_id;
|
|
|
|
self.used_imports.insert((id, TypeNS));
|
|
|
|
let trait_name = self.get_trait_name(did);
|
|
|
|
self.record_import_use(id, trait_name);
|
2014-11-29 15:41:21 -06:00
|
|
|
if let Some(DefId{krate: kid, ..}) = target.target_module.def_id.get() {
|
|
|
|
self.used_crates.insert(kid);
|
2014-09-11 12:14:43 -05:00
|
|
|
}
|
2012-07-11 17:00:40 -05:00
|
|
|
}
|
2014-04-22 11:06:43 -05:00
|
|
|
}
|
2013-05-20 11:41:20 -05:00
|
|
|
|
2014-04-14 03:30:59 -05:00
|
|
|
match search_module.parent_link.clone() {
|
2014-04-22 11:06:43 -05:00
|
|
|
NoParentLink | ModuleParentLink(..) => break,
|
|
|
|
BlockParentLink(parent_module, _) => {
|
2014-04-14 03:30:59 -05:00
|
|
|
search_module = parent_module.upgrade().unwrap();
|
2012-07-11 17:00:40 -05:00
|
|
|
}
|
2014-04-22 11:06:43 -05:00
|
|
|
}
|
2012-07-11 17:00:40 -05:00
|
|
|
}
|
|
|
|
|
2014-04-22 11:06:43 -05:00
|
|
|
found_traits
|
2012-07-11 17:00:40 -05:00
|
|
|
}
|
|
|
|
|
2015-02-16 22:44:23 -06:00
|
|
|
fn record_def(&mut self, node_id: NodeId, resolution: PathResolution) {
|
|
|
|
debug!("(recording def) recording {:?} for {}", resolution, node_id);
|
|
|
|
assert!(match resolution.last_private {LastImport{..} => false, _ => true},
|
2014-02-11 13:19:18 -06:00
|
|
|
"Import should only be used for `use` directives");
|
2014-09-18 16:05:52 -05:00
|
|
|
|
2015-02-16 22:44:23 -06:00
|
|
|
if let Some(prev_res) = self.def_map.borrow_mut().insert(node_id, resolution) {
|
|
|
|
let span = self.ast_map.opt_span(node_id).unwrap_or(codemap::DUMMY_SP);
|
|
|
|
self.session.span_bug(span, &format!("path resolved multiple times \
|
|
|
|
({:?} before, {:?} now)",
|
|
|
|
prev_res, resolution));
|
2014-09-18 16:05:52 -05:00
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2013-10-02 07:33:01 -05:00
|
|
|
fn enforce_default_binding_mode(&mut self,
|
2013-09-30 12:37:17 -05:00
|
|
|
pat: &Pat,
|
2013-09-01 20:45:37 -05:00
|
|
|
pat_binding_mode: BindingMode,
|
2013-05-31 17:17:22 -05:00
|
|
|
descr: &str) {
|
2013-01-24 18:24:45 -06:00
|
|
|
match pat_binding_mode {
|
2013-10-20 07:31:23 -05:00
|
|
|
BindByValue(_) => {}
|
2013-11-28 14:22:53 -06:00
|
|
|
BindByRef(..) => {
|
2014-05-16 12:45:16 -05:00
|
|
|
self.resolve_error(pat.span,
|
2015-01-07 10:58:31 -06:00
|
|
|
&format!("cannot use `ref` binding mode \
|
2014-05-16 12:45:16 -05:00
|
|
|
with {}",
|
2015-02-20 13:08:14 -06:00
|
|
|
descr));
|
2013-01-24 18:24:45 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-05-22 12:54:12 -05:00
|
|
|
//
|
|
|
|
// Diagnostics
|
|
|
|
//
|
|
|
|
// Diagnostics are not particularly efficient, because they're rarely
|
|
|
|
// hit.
|
|
|
|
//
|
|
|
|
|
2012-12-29 12:25:09 -06:00
|
|
|
/// A somewhat inefficient routine to obtain the name of a module.
|
2014-06-21 05:39:03 -05:00
|
|
|
fn module_to_string(&self, module: &Module) -> String {
|
2014-09-30 19:11:34 -05:00
|
|
|
let mut names = Vec::new();
|
2014-04-14 03:30:59 -05:00
|
|
|
|
2014-09-30 19:11:34 -05:00
|
|
|
fn collect_mod(names: &mut Vec<ast::Name>, module: &Module) {
|
2014-04-14 03:30:59 -05:00
|
|
|
match module.parent_link {
|
|
|
|
NoParentLink => {}
|
|
|
|
ModuleParentLink(ref module, name) => {
|
2014-09-30 19:11:34 -05:00
|
|
|
names.push(name);
|
|
|
|
collect_mod(names, &*module.upgrade().unwrap());
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2014-04-14 03:30:59 -05:00
|
|
|
BlockParentLink(ref module, _) => {
|
2014-07-06 18:02:48 -05:00
|
|
|
// danger, shouldn't be ident?
|
2014-09-30 19:11:34 -05:00
|
|
|
names.push(special_idents::opaque.name);
|
|
|
|
collect_mod(names, &*module.upgrade().unwrap());
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-09-30 19:11:34 -05:00
|
|
|
collect_mod(&mut names, module);
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2014-09-30 19:11:34 -05:00
|
|
|
if names.len() == 0 {
|
2014-05-25 05:17:19 -05:00
|
|
|
return "???".to_string();
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
2015-01-07 10:58:31 -06:00
|
|
|
self.names_to_string(&names.into_iter().rev()
|
2015-02-20 13:08:14 -06:00
|
|
|
.collect::<Vec<ast::Name>>())
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2013-12-08 01:55:28 -06:00
|
|
|
#[allow(dead_code)] // useful for debugging
|
2014-04-14 03:30:59 -05:00
|
|
|
fn dump_module(&mut self, module_: Rc<Module>) {
|
2014-06-21 05:39:03 -05:00
|
|
|
debug!("Dump of module `{}`:", self.module_to_string(&*module_));
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("Children:");
|
2014-12-30 12:16:42 -06:00
|
|
|
build_reduced_graph::populate_module_if_necessary(self, &module_);
|
2015-01-31 11:20:46 -06:00
|
|
|
for (&name, _) in &*module_.children.borrow() {
|
2014-02-13 23:07:09 -06:00
|
|
|
debug!("* {}", token::get_name(name));
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
|
2013-10-21 15:08:31 -05:00
|
|
|
debug!("Import resolutions:");
|
2013-12-21 17:15:54 -06:00
|
|
|
let import_resolutions = module_.import_resolutions.borrow();
|
2015-01-31 11:20:46 -06:00
|
|
|
for (&name, import_resolution) in &*import_resolutions {
|
2013-04-30 15:35:01 -05:00
|
|
|
let value_repr;
|
2013-03-21 03:10:57 -05:00
|
|
|
match import_resolution.target_for_namespace(ValueNS) {
|
2014-05-25 05:10:11 -05:00
|
|
|
None => { value_repr = "".to_string(); }
|
2012-08-26 14:12:05 -05:00
|
|
|
Some(_) => {
|
2014-05-25 05:10:11 -05:00
|
|
|
value_repr = " value:?".to_string();
|
2013-02-14 20:37:25 -06:00
|
|
|
// FIXME #4954
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-04-30 15:35:01 -05:00
|
|
|
let type_repr;
|
2013-03-21 03:10:57 -05:00
|
|
|
match import_resolution.target_for_namespace(TypeNS) {
|
2014-05-25 05:10:11 -05:00
|
|
|
None => { type_repr = "".to_string(); }
|
2012-08-26 14:12:05 -05:00
|
|
|
Some(_) => {
|
2014-05-25 05:10:11 -05:00
|
|
|
type_repr = " type:?".to_string();
|
2013-02-14 20:37:25 -06:00
|
|
|
// FIXME #4954
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-13 23:07:09 -06:00
|
|
|
debug!("* {}:{}{}", token::get_name(name), value_repr, type_repr);
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-02-19 01:40:42 -06:00
|
|
|
pub struct CrateMap {
|
2014-03-28 12:05:27 -05:00
|
|
|
pub def_map: DefMap,
|
2014-09-17 21:45:21 -05:00
|
|
|
pub freevars: RefCell<FreevarMap>,
|
2014-12-18 12:27:17 -06:00
|
|
|
pub export_map: ExportMap,
|
2014-03-28 12:05:27 -05:00
|
|
|
pub trait_map: TraitMap,
|
|
|
|
pub external_exports: ExternalExports,
|
2014-11-23 03:29:41 -06:00
|
|
|
pub glob_map: Option<GlobMap>
|
|
|
|
}
|
|
|
|
|
2015-01-03 21:54:18 -06:00
|
|
|
#[derive(PartialEq,Copy)]
|
2014-11-23 03:29:41 -06:00
|
|
|
pub enum MakeGlobMap {
|
|
|
|
Yes,
|
|
|
|
No
|
2013-02-19 01:40:42 -06:00
|
|
|
}
|
|
|
|
|
2012-07-04 16:53:12 -05:00
|
|
|
/// Entry point to crate resolution.
|
2014-11-23 03:29:41 -06:00
|
|
|
pub fn resolve_crate<'a, 'tcx>(session: &'a Session,
|
|
|
|
ast_map: &'a ast_map::Map<'tcx>,
|
|
|
|
_: &LanguageItems,
|
|
|
|
krate: &Crate,
|
|
|
|
make_glob_map: MakeGlobMap)
|
|
|
|
-> CrateMap {
|
|
|
|
let mut resolver = Resolver::new(session, ast_map, krate.span, make_glob_map);
|
2014-12-19 01:13:54 -06:00
|
|
|
|
2014-12-30 12:16:42 -06:00
|
|
|
build_reduced_graph::build_reduced_graph(&mut resolver, krate);
|
2014-12-19 01:13:54 -06:00
|
|
|
session.abort_if_errors();
|
|
|
|
|
|
|
|
resolver.resolve_imports();
|
|
|
|
session.abort_if_errors();
|
|
|
|
|
2014-12-19 01:14:42 -06:00
|
|
|
record_exports::record(&mut resolver);
|
2014-12-19 01:13:54 -06:00
|
|
|
session.abort_if_errors();
|
|
|
|
|
|
|
|
resolver.resolve_crate(krate);
|
|
|
|
session.abort_if_errors();
|
|
|
|
|
|
|
|
check_unused::check_crate(&mut resolver, krate);
|
|
|
|
|
2013-02-19 01:40:42 -06:00
|
|
|
CrateMap {
|
2014-09-17 21:45:21 -05:00
|
|
|
def_map: resolver.def_map,
|
|
|
|
freevars: resolver.freevars,
|
2014-12-18 12:27:17 -06:00
|
|
|
export_map: resolver.export_map,
|
2014-09-17 21:45:21 -05:00
|
|
|
trait_map: resolver.trait_map,
|
|
|
|
external_exports: resolver.external_exports,
|
2014-11-23 03:29:41 -06:00
|
|
|
glob_map: if resolver.make_glob_map {
|
|
|
|
Some(resolver.glob_map)
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
},
|
2013-02-19 01:40:42 -06:00
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
}
|