remove namespace check in nameres

Author: jdonszelmann

compiler/rustc_attr_data_structures/src/lints.rs

@@ -0,0 +1,17 @@
+// pub type HirDelayedLint = (
+//     &'static Lint,
+//     HirId,
+//     Span,
+//     Box<dyn DynSend + for<'a, 'b> FnOnce(&'b mut Diag<'a, ()>) + 'static>,
+// );
+
+use rustc_span::Span;
+
+pub enum AttributeLintKind {
+    UnusedDuplicate { unused: Span, used: Span, warning: bool },
+}
+
+pub struct AttributeLint<Id> {
+    pub id: Id,
+    pub kind: AttributeLintKind,
+}

compiler/rustc_hir_analysis/src/check/compare_eii.rs

@@ -2,16 +2,14 @@ use std::borrow::Cow;
 use std::iter;
 
 use rustc_data_structures::fx::FxIndexSet;
-use rustc_errors::{
-    Applicability, Applicability, E0053, E0053, struct_span_code_err, struct_span_code_err,
-};
+use rustc_errors::{Applicability, E0053, E0053, struct_span_code_err, struct_span_code_err};
 use rustc_hir::def_id::{DefId, LocalDefId};
 use rustc_hir::{self as hir, self as hir, HirId, HirId, ItemKind, ItemKind};
 use rustc_infer::infer::{self, InferCtxt, TyCtxtInferExt};
 use rustc_infer::traits::{ObligationCause, ObligationCauseCode};
 use rustc_middle::ty;
 use rustc_middle::ty::TyCtxt;
-use rustc_middle::ty::error::{ExpectedFound, ExpectedFound, TypeError, TypeError};
+use rustc_middle::ty::error::{ExpectedFound, TypeError, TypeError};
 use rustc_span::{ErrorGuaranteed, Ident, Span};
 use rustc_trait_selection::error_reporting::InferCtxtErrorExt;
 use rustc_trait_selection::regions::InferCtxtRegionExt;
@@ -54,11 +52,13 @@ pub(crate) fn compare_eii_function_types<'tcx>(
     // type.
 
     let wf_tys = FxIndexSet::default();
-
     let external_impl_sig = infcx.instantiate_binder_with_fresh_vars(
         external_impl_span,
         infer::HigherRankedType,
-        tcx.fn_sig(external_impl).instantiate_identity(),
+        tcx.fn_sig(external_impl).instantiate(
+            tcx,
+            infcx.fresh_args_for_item(external_impl_span, external_impl.to_def_id()),
+        ),
     );
 
     let norm_cause = ObligationCause::misc(external_impl_span, external_impl);

compiler/rustc_resolve/src/ident.rs

@@ -294,7 +294,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
         ribs: &[Rib<'ra>],
         ignore_binding: Option<NameBinding<'ra>>,
     ) -> Option<LexicalScopeBinding<'ra>> {
-        assert!(ns == TypeNS || ns == ValueNS);
         let orig_ident = ident;
         let (general_span, normalized_span) = if ident.name == kw::SelfUpper {
             // FIXME(jseyfried) improve `Self` hygiene

tests/ui/eii/auxiliary/cross_crate_eii_declaration.rs

@@ -0,0 +1,14 @@
+#![feature(eii)]
+#![feature(decl_macro)]
+#![feature(rustc_attrs)]
+#![feature(eii_internals)]
+
+#[core::eii_macro_for(bar)]
+#[rustc_builtin_macro(eii_macro)]
+pub macro foo() {
+
+}
+
+unsafe extern "Rust" {
+    pub safe fn bar(x: u64) -> u64;
+}

tests/ui/eii/cross_crate.rs

@@ -0,0 +1,18 @@
+//@ compile-flags: --crate-type rlib
+//@ check-pass
+//@ aux-build: cross_crate_eii_declaration.rs
+#![feature(eii)]
+#![feature(decl_macro)]
+#![feature(rustc_attrs)]
+#![feature(eii_internals)]
+
+extern crate cross_crate_eii_declaration;
+
+#[unsafe(cross_crate_eii_declaration::foo)]
+fn other(x: u64) -> u64 {
+    x
+}
+
+fn main() {
+    cross_crate_eii_declaration::bar(0);
+}

tests/ui/eii/subtype_1.rs

@@ -1,5 +1,4 @@
 //@ compile-flags: --crate-type rlib
-//@ check-pass
 #![feature(eii)]
 #![feature(decl_macro)]
 #![feature(rustc_attrs)]

tests/ui/eii/subtype_3.rs

@@ -0,0 +1,25 @@
+//@ compile-flags: --crate-type rlib
+//@ check-pass
+#![feature(eii)]
+#![feature(decl_macro)]
+#![feature(rustc_attrs)]
+#![feature(eii_internals)]
+
+#[core::eii_macro_for(bar)]
+#[rustc_builtin_macro(eii_macro)]
+macro foo() {
+
+}
+
+unsafe extern "Rust" {
+    safe fn bar<'a>(x: &'a u64) -> &'a u64;
+}
+
+#[foo]
+fn other<'a>(x: &'a u64) -> &'static u64 {
+    &0
+}
+
+fn main() {
+    bar(&0);
+}

tests/ui/eii/subtype_4.rs

@@ -0,0 +1,25 @@
+//@ compile-flags: --crate-type rlib
+//@ check-pass
+#![feature(eii)]
+#![feature(decl_macro)]
+#![feature(rustc_attrs)]
+#![feature(eii_internals)]
+
+#[core::eii_macro_for(bar)]
+#[rustc_builtin_macro(eii_macro)]
+macro foo() {
+
+}
+
+unsafe extern "Rust" {
+    safe fn bar(x: u64) -> u64;
+}
+
+#[foo]
+fn other(x: u64) -> u64 {
+    x
+}
+
+fn main() {
+    bar(0);
+}

tests/ui/eii/wrong_ty.rs

@@ -15,7 +15,7 @@ unsafe extern "Rust" {
 }
 
 #[foo]
-fn other() -> u64 {
+fn other(x: usize) -> u64 {
 //~^ ERROR function `other` has a type that is incompatible with the declaration
     3
 }

tests/ui/eii/wrong_ty.stderr

@@ -1,16 +1,21 @@
 error[E0053]: function `other` has a type that is incompatible with the declaration
-  --> $DIR/wrong_ty.rs:18:1
+  --> $DIR/wrong_ty.rs:18:13
    |
-LL | fn other() -> u64 {
-   | ^^^^^^^^^^^^^^^^^ incorrect number of function parameters
+LL | fn other(x: usize) -> u64 {
+   |             ^^^^^ expected `u64`, found `usize`
    |
 note: type in declaration
-  --> $DIR/wrong_ty.rs:14:5
+  --> $DIR/wrong_ty.rs:14:20
    |
 LL |     safe fn bar(x: u64) -> u64;
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |                    ^^^
    = note: expected signature `fn(u64) -> _`
-              found signature `fn() -> _`
+              found signature `fn(usize) -> _`
+help: change the parameter type to match the declaration
+   |
+LL - fn other(x: usize) -> u64 {
+LL + fn other(x: u64) -> u64 {
+   |
 
 error: aborting due to 1 previous error
 

tests/ui/eii/wrong_ty_2.rs

@@ -0,0 +1,25 @@
+//@ compile-flags: --crate-type rlib
+#![feature(eii)]
+#![feature(decl_macro)]
+#![feature(rustc_attrs)]
+#![feature(eii_internals)]
+
+#[core::eii_macro_for(bar)]
+#[rustc_builtin_macro(eii_macro)]
+macro foo() {
+
+}
+
+unsafe extern "Rust" {
+    safe fn bar(x: u64) -> u64;
+}
+
+#[foo]
+fn other() -> u64 {
+//~^ ERROR function `other` has a type that is incompatible with the declaration
+    3
+}
+
+fn main() {
+    bar(0);
+}

tests/ui/eii/wrong_ty_2.stderr

@@ -0,0 +1,17 @@
+error[E0053]: function `other` has a type that is incompatible with the declaration
+  --> $DIR/wrong_ty_2.rs:18:1
+   |
+LL | fn other() -> u64 {
+   | ^^^^^^^^^^^^^^^^^ incorrect number of function parameters
+   |
+note: type in declaration
+  --> $DIR/wrong_ty_2.rs:14:5
+   |
+LL |     safe fn bar(x: u64) -> u64;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: expected signature `fn(u64) -> _`
+              found signature `fn() -> _`
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0053`.