Fix rebase conflicts

jyn514 · jyn514 · commit 587c50452f99 · 2021-05-17T23:33:04.000-04:00
diff --git 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.

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ impl<'a, 'tcx> SyntaxChecker<'a, 'tcx> {`
`53`	`53`	`return;`
`54`	`54`	`}`
`55`	`55`
`56`		`- let local_id = match item.def_id.as_local() {`
	`56`	`+ let local_id = match item.def_id.as_real().and_then(\|x\| x.as_local()) {`
`57`	`57`	`Some(id) => id,`
`58`	`58`	`// We don't need to check the syntax for other crates so returning`
`59`	`59`	`// without doing anything should not be a problem.`