diff options
| author | Camille GILLOT <gillot.camille@gmail.com> | 2019-12-29 20:45:48 +0100 |
|---|---|---|
| committer | Camille GILLOT <gillot.camille@gmail.com> | 2019-12-31 10:21:33 +0100 |
| commit | 31f85d3fe2b447e31017eb01e6aec8af30ec5a14 (patch) | |
| tree | 08b3c8576908c847b644fd118eef3325de0d2f5a | |
| parent | 1b92e7e44640e69a48c92d31cee19f982d4e6140 (diff) | |
| download | rust-31f85d3fe2b447e31017eb01e6aec8af30ec5a14.tar.gz rust-31f85d3fe2b447e31017eb01e6aec8af30ec5a14.zip | |
Review comments.
| -rw-r--r-- | src/librustc/middle/resolve_lifetime.rs | 7 | ||||
| -rw-r--r-- | src/librustc_resolve/lib.rs | 7 | ||||
| -rw-r--r-- | src/librustc_resolve/lifetimes.rs | 4 |
3 files changed, 5 insertions, 13 deletions
diff --git a/src/librustc/middle/resolve_lifetime.rs b/src/librustc/middle/resolve_lifetime.rs index 8e55e067513..a07f21fcbbe 100644 --- a/src/librustc/middle/resolve_lifetime.rs +++ b/src/librustc/middle/resolve_lifetime.rs @@ -1,9 +1,4 @@ -//! Name resolution for lifetimes. -//! -//! Name resolution for lifetimes follows *much* simpler rules than the -//! full resolve. For example, lifetime names are never exported or -//! used between functions, and they operate in a purely top-down -//! way. Therefore, we break lifetime name resolution into a separate pass. +//! Name resolution for lifetimes: type declarations. use crate::hir::def_id::{DefId, LocalDefId}; use crate::hir::{GenericParam, ItemLocalId}; diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index 4daf22d1b2b..fa3e6291c30 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -16,13 +16,6 @@ #![feature(nll)] #![recursion_limit = "256"] -#[macro_use] -extern crate rustc; -#[macro_use] -extern crate log; -#[macro_use] -extern crate syntax; - pub use rustc::hir::def::{Namespace, PerNS}; use Determinacy::*; diff --git a/src/librustc_resolve/lifetimes.rs b/src/librustc_resolve/lifetimes.rs index 5e099dba897..b2b5c387eb8 100644 --- a/src/librustc_resolve/lifetimes.rs +++ b/src/librustc_resolve/lifetimes.rs @@ -26,6 +26,10 @@ use syntax_pos::Span; use rustc::hir::intravisit::{self, NestedVisitorMap, Visitor}; use rustc::hir::{self, GenericParamKind, LifetimeParamKind}; +use log::debug; +use rustc::{bug, span_bug}; +use syntax::{help, span_err, struct_span_err, walk_list}; + use rustc::middle::resolve_lifetime::*; use rustc_error_codes::*; |