Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use opt_def_id() over def_id() #69605

Merged
merged 1 commit into from
Mar 1, 2020
Merged

Use opt_def_id() over def_id() #69605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/librustc_save_analysis/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
fn lookup_def_id(&self, ref_id: NodeId) -> Option<DefId> {
match self.get_path_res(ref_id) {
Res::PrimTy(_) | Res::SelfTy(..) | Res::Err => None,
def => Some(def.def_id()),
def => def.opt_def_id(),
}
}

Expand Down
2 changes: 2 additions & 0 deletions src/test/ui/attributes/register-attr-tool-import.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// edition:2018
// compile-flags: -Zsave-analysis
// ~^ Also regression test for #69588

#![feature(register_attr)]
#![feature(register_tool)]
Expand Down
12 changes: 6 additions & 6 deletions src/test/ui/attributes/register-attr-tool-import.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
| ^^^^^^^^^^^^^^^^^^^^
Expand Down