diff options
| author | Joshua Nelson <jyn514@gmail.com> | 2021-05-17 23:31:48 -0400 |
|---|---|---|
| committer | Joshua Nelson <jyn514@gmail.com> | 2021-05-17 23:33:04 -0400 |
| commit | 587c50452f99b437fc4dc946d58d490094e7ef66 (patch) | |
| tree | 8910dc4bc816564307db1067740899af66b26f5e | |
| parent | 18f6922d8cf13625ae067b9061c017f44b4427ea (diff) | |
| download | rust-587c50452f99b437fc4dc946d58d490094e7ef66.tar.gz rust-587c50452f99b437fc4dc946d58d490094e7ef66.zip | |
Fix rebase conflicts
| -rw-r--r-- | src/librustdoc/passes/check_code_block_syntax.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustdoc/passes/check_code_block_syntax.rs b/src/librustdoc/passes/check_code_block_syntax.rs index 0b94a74eeef..7ccfdf29041 100644 --- a/src/librustdoc/passes/check_code_block_syntax.rs +++ b/src/librustdoc/passes/check_code_block_syntax.rs @@ -53,7 +53,7 @@ impl<'a, 'tcx> SyntaxChecker<'a, 'tcx> { return; } - let local_id = match item.def_id.as_local() { + let local_id = match item.def_id.as_real().and_then(|x| x.as_local()) { Some(id) => id, // We don't need to check the syntax for other crates so returning // without doing anything should not be a problem. |