about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2020-03-01 19:28:15 +0900
committerGitHub <noreply@github.com>2020-03-01 19:28:15 +0900
commit47d87d7ca5d1c0b1bb9321893e9f62d77e109d01 (patch)
tree455bd757b51c9c5a89d102678d2917ac92ae87c3 /src/test
parent98016962148fdd22ea0b3566450dcdff46bc08b8 (diff)
parentf9c8c49c0b04322d5a0714693775a347ff7502a6 (diff)
downloadrust-47d87d7ca5d1c0b1bb9321893e9f62d77e109d01.tar.gz
rust-47d87d7ca5d1c0b1bb9321893e9f62d77e109d01.zip
Rollup merge of #69605 - JohnTitor:opt-def-id, r=petrochenkov
Use `opt_def_id()` over `def_id()`

Fixes #69588
Diffstat (limited to 'src/test')
-rw-r--r--src/test/ui/attributes/register-attr-tool-import.rs2
-rw-r--r--src/test/ui/attributes/register-attr-tool-import.stderr12
2 files changed, 8 insertions, 6 deletions
diff --git a/src/test/ui/attributes/register-attr-tool-import.rs b/src/test/ui/attributes/register-attr-tool-import.rs
index e01dc4dfa49..d3502c71f2d 100644
--- a/src/test/ui/attributes/register-attr-tool-import.rs
+++ b/src/test/ui/attributes/register-attr-tool-import.rs
@@ -1,4 +1,6 @@
 // edition:2018
+// compile-flags: -Zsave-analysis
+// ~^ Also regression test for #69588
 
 #![feature(register_attr)]
 #![feature(register_tool)]
diff --git a/src/test/ui/attributes/register-attr-tool-import.stderr b/src/test/ui/attributes/register-attr-tool-import.stderr
index 59f5a8620ab..90b7e169a2f 100644
--- a/src/test/ui/attributes/register-attr-tool-import.stderr
+++ b/src/test/ui/attributes/register-attr-tool-import.stderr
@@ -1,35 +1,35 @@
 error: cannot use an explicitly registered attribute through an import
-  --> $DIR/register-attr-tool-import.rs:12:3
+  --> $DIR/register-attr-tool-import.rs:14:3
    |
 LL | #[renamed_attr]
    |   ^^^^^^^^^^^^
    |
 note: the explicitly registered attribute imported here
-  --> $DIR/register-attr-tool-import.rs:9:5
+  --> $DIR/register-attr-tool-import.rs:11:5
    |
 LL | use attr as renamed_attr; // OK
    |     ^^^^^^^^^^^^^^^^^^^^
 
 error: cannot use a tool module through an import
-  --> $DIR/register-attr-tool-import.rs:13:3
+  --> $DIR/register-attr-tool-import.rs:15:3
    |
 LL | #[renamed_tool::attr]
    |   ^^^^^^^^^^^^
    |
 note: the tool module imported here
-  --> $DIR/register-attr-tool-import.rs:10:5
+  --> $DIR/register-attr-tool-import.rs:12:5
    |
 LL | use tool as renamed_tool; // OK
    |     ^^^^^^^^^^^^^^^^^^^^
 
 error: cannot use a tool module through an import
-  --> $DIR/register-attr-tool-import.rs:13:3
+  --> $DIR/register-attr-tool-import.rs:15:3
    |
 LL | #[renamed_tool::attr]
    |   ^^^^^^^^^^^^
    |
 note: the tool module imported here
-  --> $DIR/register-attr-tool-import.rs:10:5
+  --> $DIR/register-attr-tool-import.rs:12:5
    |
 LL | use tool as renamed_tool; // OK
    |     ^^^^^^^^^^^^^^^^^^^^