Auto merge of #56549 - pietroalbini:rollup, r=pietroalbini
Rollup of 15 pull requests Successful merges: - #51753 (Document `From` implementations) - #55563 (Improve no result found sentence in doc search) - #55987 (Add Weak.ptr_eq) - #56119 (Utilize `?` instead of `return None`.) - #56372 (Refer to the second borrow as the "second borrow" in E0501.rs) - #56388 (More MIR borrow check cleanup) - #56424 (Mention raw-ident syntax) - #56452 (Remove redundant clones) - #56456 (Handle existential types in dead code analysis) - #56466 (data_structures: remove tuple_slice) - #56476 (Fix invalid line number match) - #56497 (cleanup: remove static lifetimes from consts in libstd) - #56498 (Fix line numbers display) - #56523 (Added a bare-bones eslint config (removing jslint)) - #56538 (Use inner iterator may_have_side_effect for Cloned) Failed merges: r? @ghost
This commit is contained in:
commit
4988b096e6
59 changed files with 518 additions and 418 deletions
|
@ -2220,13 +2220,13 @@ impl<'a> Item<'a> {
|
|||
return None;
|
||||
}
|
||||
} else {
|
||||
let (krate, src_root) = match cache.extern_locations.get(&self.item.def_id.krate) {
|
||||
Some(&(ref name, ref src, Local)) => (name, src),
|
||||
Some(&(ref name, ref src, Remote(ref s))) => {
|
||||
let (krate, src_root) = match *cache.extern_locations.get(&self.item.def_id.krate)? {
|
||||
(ref name, ref src, Local) => (name, src),
|
||||
(ref name, ref src, Remote(ref s)) => {
|
||||
root = s.to_string();
|
||||
(name, src)
|
||||
}
|
||||
Some(&(_, _, Unknown)) | None => return None,
|
||||
(_, _, Unknown) => return None,
|
||||
};
|
||||
|
||||
clean_srcpath(&src_root, file, false, |component| {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue