about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-08-26 18:53:16 +0000
committerbors <bors@rust-lang.org>2022-08-26 18:53:16 +0000
commitc07a8b4e09f356c7468b69c50cac7fc5b5000b8a (patch)
treeb3966bb3bf3b03ef22c88a8709fe92c1ab8d24f4
parent450e99f93795c81c1f2d10be27fb3a98be5b0cfc (diff)
parent36faf8fc7e4e2b93faac47b59f89d67c61bf101e (diff)
downloadrust-c07a8b4e09f356c7468b69c50cac7fc5b5000b8a.tar.gz
rust-c07a8b4e09f356c7468b69c50cac7fc5b5000b8a.zip
Auto merge of #101039 - ouz-a:issue-100991, r=compiler-errors
Don't catch overflow when running with cargo doc

Fixes #100991

r? `@compiler-errors`
-rw-r--r--compiler/rustc_trait_selection/src/traits/project.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/rustc_trait_selection/src/traits/project.rs b/compiler/rustc_trait_selection/src/traits/project.rs
index aeaccffd5f5..444ca6471e2 100644
--- a/compiler/rustc_trait_selection/src/traits/project.rs
+++ b/compiler/rustc_trait_selection/src/traits/project.rs
@@ -557,7 +557,10 @@ impl<'a, 'b, 'tcx> TypeFolder<'tcx> for AssocTypeNormalizer<'a, 'b, 'tcx> {
                 // For cases like #95134 we would like to catch overflows early
                 // otherwise they slip away away and cause ICE.
                 let recursion_limit = self.tcx().recursion_limit();
-                if !recursion_limit.value_within_limit(self.depth) {
+                if !recursion_limit.value_within_limit(self.depth)
+                    // HACK: Don't overflow when running cargo doc see #100991
+                    && !self.tcx().sess.opts.actually_rustdoc
+                {
                     let obligation = Obligation::with_depth(
                         self.cause.clone(),
                         recursion_limit.0,