Importing rustc-1.53.0
Bug: 194400612
Change-Id: Id2f38eeabc8325fff960e46b89b1cc7216f5227c
diff --git a/compiler/rustc_resolve/src/diagnostics.rs b/compiler/rustc_resolve/src/diagnostics.rs
index 7493fd6..6ea46f5 100644
--- a/compiler/rustc_resolve/src/diagnostics.rs
+++ b/compiler/rustc_resolve/src/diagnostics.rs
@@ -450,12 +450,12 @@
self.session,
span,
E0128,
- "type parameters with a default cannot use \
+ "generic parameters with a default cannot use \
forward declared identifiers"
);
err.span_label(
span,
- "defaulted type parameters cannot be forward declared".to_string(),
+ "defaulted generic parameters cannot be forward declared".to_string(),
);
err
}
@@ -472,17 +472,6 @@
);
err
}
- ResolutionError::ParamInAnonConstInTyDefault(name) => {
- let mut err = self.session.struct_span_err(
- span,
- "constant values inside of type parameter defaults must not depend on generic parameters",
- );
- err.span_label(
- span,
- format!("the anonymous constant must not depend on the parameter `{}`", name),
- );
- err
- }
ResolutionError::ParamInNonTrivialAnonConst { name, is_type } => {
let mut err = self.session.struct_span_err(
span,
@@ -498,7 +487,13 @@
name
));
}
- err.help("use `#![feature(const_generics)]` and `#![feature(const_evaluatable_checked)]` to allow generic const expressions");
+
+ if self.session.is_nightly_build() {
+ err.help(
+ "use `#![feature(const_generics)]` and `#![feature(const_evaluatable_checked)]` \
+ to allow generic const expressions"
+ );
+ }
err
}
@@ -606,7 +601,7 @@
/// Lookup typo candidate in scope for a macro or import.
fn early_lookup_typo_candidate(
&mut self,
- scope_set: ScopeSet,
+ scope_set: ScopeSet<'a>,
parent_scope: &ParentScope<'a>,
ident: Ident,
filter_fn: &impl Fn(Res) -> bool,
@@ -662,7 +657,7 @@
let root_module = this.resolve_crate_root(root_ident);
this.add_module_candidates(root_module, &mut suggestions, filter_fn);
}
- Scope::Module(module) => {
+ Scope::Module(module, _) => {
this.add_module_candidates(module, &mut suggestions, filter_fn);
}
Scope::RegisteredAttrs => {
@@ -758,17 +753,14 @@
{
let mut candidates = Vec::new();
let mut seen_modules = FxHashSet::default();
- let not_local_module = crate_name.name != kw::Crate;
- let mut worklist =
- vec![(start_module, Vec::<ast::PathSegment>::new(), true, not_local_module)];
+ let mut worklist = vec![(start_module, Vec::<ast::PathSegment>::new(), true)];
let mut worklist_via_import = vec![];
- while let Some((in_module, path_segments, accessible, in_module_is_extern)) =
- match worklist.pop() {
- None => worklist_via_import.pop(),
- Some(x) => Some(x),
- }
- {
+ while let Some((in_module, path_segments, accessible)) = match worklist.pop() {
+ None => worklist_via_import.pop(),
+ Some(x) => Some(x),
+ } {
+ let in_module_is_extern = !in_module.def_id().unwrap().is_local();
// We have to visit module children in deterministic order to avoid
// instabilities in reported imports (#43552).
in_module.for_each_child(self, |this, ident, ns, name_binding| {
@@ -850,11 +842,10 @@
name_binding.is_extern_crate() && lookup_ident.span.rust_2018();
if !is_extern_crate_that_also_appears_in_prelude {
- let is_extern = in_module_is_extern || name_binding.is_extern_crate();
// add the module to the lookup
if seen_modules.insert(module.def_id().unwrap()) {
if via_import { &mut worklist_via_import } else { &mut worklist }
- .push((module, path_segments, child_accessible, is_extern));
+ .push((module, path_segments, child_accessible));
}
}
}
