add tests

Author: jdonszelmann

compiler/rustc_hir_analysis/src/check/compare_eii.rs

@@ -2,14 +2,16 @@ use std::borrow::Cow;
 use std::iter;
 
 use rustc_data_structures::fx::FxIndexSet;
-use rustc_errors::{Applicability, E0053, struct_span_code_err};
+use rustc_errors::{
+    Applicability, Applicability, E0053, E0053, struct_span_code_err, struct_span_code_err,
+};
 use rustc_hir::def_id::{DefId, LocalDefId};
-use rustc_hir::{self as hir, HirId, ItemKind};
+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, TypeError};
+use rustc_middle::ty::error::{ExpectedFound, ExpectedFound, TypeError, TypeError};
 use rustc_span::{ErrorGuaranteed, Ident, Span};
 use rustc_trait_selection::error_reporting::InferCtxtErrorExt;
 use rustc_trait_selection::regions::InferCtxtRegionExt;
@@ -63,7 +65,7 @@ pub(crate) fn compare_eii_function_types<'tcx>(
     let external_impl_sig = ocx.normalize(&norm_cause, param_env, external_impl_sig);
     debug!(?external_impl_sig);
 
-    let declaration_sig = tcx.fn_sig(declaration).no_bound_vars().expect("no bound vars");
+    let declaration_sig = tcx.fn_sig(declaration).instantiate_identity();
     let declaration_sig =
         tcx.liberate_late_bound_regions(external_impl.to_def_id(), declaration_sig);
     let declaration_sig = ocx.normalize(&norm_cause, param_env, declaration_sig);

tests/ui/eii/subtype_1.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, 'b>(x: &'b u64) -> &'a u64;
+}
+
+#[foo]
+fn other<'a, 'b>(x: &'b u64) -> &'b u64 {
+    &0
+}
+
+fn main() {
+    bar(&0);
+}

tests/ui/eii/subtype_2.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: &'static u64) -> &'a u64;
+}
+
+#[foo]
+fn other<'a>(x: &'a u64) -> &'static u64 {
+    &0
+}
+
+fn main() {
+    bar(&0);
+}

tests/ui/eii/unsafe_impl_err.rs

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

tests/ui/eii/unsafe_impl_err.stderr

@@ -0,0 +1,13 @@
+error: `#[foo]` is unsafe to implement
+  --> $DIR/unsafe_impl_err.rs:17:1
+   |
+LL | #[foo]
+   | ^^^^^^
+   |
+help: wrap the attribute in `unsafe(...)`
+   |
+LL | #[unsafe(foo)]
+   |   +++++++   +
+
+error: aborting due to 1 previous error
+

tests/ui/eii/unsafe_impl_ok.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, "unsafe")]
+#[rustc_builtin_macro(eii_macro)]
+macro foo() {
+
+}
+
+unsafe extern "Rust" {
+    safe fn bar(x: u64) -> u64;
+}
+
+#[unsafe(foo)]
+fn other(x: u64) -> u64 {
+    x
+}
+
+fn main() {
+    bar(0);
+}

tests/ui/eii/wrong_ret_ty.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(_x: u64) {
+//~^ ERROR function `other` has a type that is incompatible with the declaration
+
+}
+
+fn main() {
+    bar(0);
+}

tests/ui/eii/wrong_ret_ty.stderr

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

tests/ui/eii/wrong_ty.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.stderr

@@ -0,0 +1,17 @@
+error[E0053]: function `other` has a type that is incompatible with the declaration
+  --> $DIR/wrong_ty.rs:18:1
+   |
+LL | fn other() -> u64 {
+   | ^^^^^^^^^^^^^^^^^ incorrect number of function parameters
+   |
+note: type in declaration
+  --> $DIR/wrong_ty.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`.