Replace error callback with Result #63286
Conversation
rust-highfive
added
the
S-waiting-on-review
src/librustc_resolve/lib.rs
Outdated
| } else { | ||
| Ok((path, res)) | ||
| match self.resolve_ast_path_inner(&path, is_value) { | ||
| Ok(res) => { |
There was a problem hiding this comment.
| Ok(res) => { | |
| Ok(res) if res != Res::Err => { |
Although, I'd rather remove this condition (and then use ?).
If the function returns Res, then rustdoc should be ready to deal with Res::Err as well.
petrochenkov
added
S-waiting-on-author
Mark-Simulacrum
force-pushed
the
resolve-no-cb
branch
from
ebce9f5 to
3cd7f08
Compare
|
Removed the condition, mostly by uplifting it into rustdoc. I'm not sure if those changes are a correct handling of this -- the code looks a bit questionable to me -- but I don't think this is quite the place to refactor rustdoc's resolution too much :) Happy to do so if you disagree, though! |
Mark-Simulacrum
added
S-waiting-on-review
|
@bors r+ |
|
📌 Commit 3cd7f08 has been approved by |
bors
added
S-waiting-on-bors
…trochenkov Replace error callback with Result r? @petrochenkov
…trochenkov Replace error callback with Result r? @petrochenkov
Rollup of 6 pull requests Successful merges: - #62459 (Use internal iteration in the Sum and Product impls of Result and Option) - #62821 (Not listed methods) - #62837 (Fix theme picker blur handler: always hide instead of switching) - #63286 (Replace error callback with Result) - #63296 (Deduplicate rustc_demangle in librustc_codegen_llvm) - #63298 (assume_init: warn about valid != safe) Failed merges: r? @ghost
| } | ||
|
|
||
| /// Like `resolve_ast_path`, but takes a callback in case there was an error. | ||
| // FIXME(eddyb) use `Result` or something instead of callbacks. | ||
| fn resolve_ast_path_cb<F>( | ||
| fn resolve_ast_path_inner( |
There was a problem hiding this comment.
The comment wasn't updated. But other than that I'm really happy the callback is gone!
There was a problem hiding this comment.
I think it was lost in a rebase. I've added to my todo list to check if it's been removed after some of the resolver refactorings land so I don't cause merge conflicts and such.
r? @petrochenkov