Rollup merge of #122540 - WaffleLapkin:ununexpected, r=estebank
Do not use `?`-induced skewing of type inference in the compiler This prevents breakage from #122412 and is generally a good idea. r? `@estebank`
This commit is contained in:
commit
9fb40efa6d
11 changed files with 30 additions and 18 deletions
|
@ -12,6 +12,7 @@
|
|||
#![feature(proc_macro_internals)]
|
||||
#![feature(proc_macro_span)]
|
||||
#![feature(try_blocks)]
|
||||
#![feature(yeet_expr)]
|
||||
#![allow(rustc::diagnostic_outside_of_impl)]
|
||||
#![allow(internal_features)]
|
||||
|
||||
|
|
|
@ -62,7 +62,7 @@ pub(crate) fn parse_external_mod(
|
|||
|
||||
// Ensure file paths are acyclic.
|
||||
if let Some(pos) = module.file_path_stack.iter().position(|p| p == &mp.file_path) {
|
||||
Err(ModError::CircularInclusion(module.file_path_stack[pos..].to_vec()))?;
|
||||
do yeet ModError::CircularInclusion(module.file_path_stack[pos..].to_vec());
|
||||
}
|
||||
|
||||
// Actually parse the external file as a module.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue