nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-21 19:33:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't return a BoxedResolver on errors

Browse Source
This commit is contained in:
bjorn3 2021-06-01 10:15:28 +02:00
parent 9d9ccec3fc
commit 36bdfdc411
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/rustc_interface/src/passes.rs
View File

@ -128,7 +128,7 @@ pub struct BoxedResolver {
}
impl BoxedResolver {
fn new<T>(generator: T) -> (Result<ast::Crate>, Self)
fn new<T>(generator: T) -> Result<(ast::Crate, Self)>
where
T: ::std::ops::Generator<
Action,
@ -144,7 +144,7 @@ impl BoxedResolver {
_ => panic!(),
};
(init, BoxedResolver { generator })
init.map(|init| (init, BoxedResolver { generator }))
}
pub fn access<F: for<'a> FnOnce(&mut Resolver<'a>) -> R, R>(&mut self, f: F) -> R {
@ -206,7 +206,7 @@ pub fn configure_and_expand(
// its contents but the results of name resolution on those contents. Hopefully we'll push
// this back at some point.
let crate_name = crate_name.to_string();
let (result, resolver) = BoxedResolver::new(static move |mut action| {
BoxedResolver::new(static move |mut action| {
let _ = action;
let sess = &*sess;
let resolver_arenas = Resolver::arenas();
@ -248,8 +248,7 @@ pub fn configure_and_expand(
}
resolver.into_outputs()
});
result.map(|k| (k, resolver))
})
}
pub fn register_plugins<'a>(