diff options
| author | bors <bors@rust-lang.org> | 2014-12-09 14:02:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-12-09 14:02:45 +0000 |
| commit | ef4982f0f8643af9e7deede95ad5e4e8df854d66 (patch) | |
| tree | ed63942aeef2d2e9e2b8378751695b19f7e9f25e /src/librustc_driver | |
| parent | cafe2966770ff377aad6dd9fd808e68055587c58 (diff) | |
| parent | 34812b891db7a699cebddb584e6c6ae44f82ed2e (diff) | |
| download | rust-ef4982f0f8643af9e7deede95ad5e4e8df854d66.tar.gz rust-ef4982f0f8643af9e7deede95ad5e4e8df854d66.zip | |
auto merge of #19466 : nikomatsakis/rust/recursion-limit, r=eddyb
This is particularly important for deeply nested types, which generate deeply nested impls. This is a fix for #19318. It's possible we could also improve this particular case not to increment the recursion count, but it's worth being able to adjust the recursion limit anyhow. cc @jdm r? @pcwalton
Diffstat (limited to 'src/librustc_driver')
| -rw-r--r-- | src/librustc_driver/driver.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs index f3d76a8f12f..749bed15e38 100644 --- a/src/librustc_driver/driver.rs +++ b/src/librustc_driver/driver.rs @@ -180,6 +180,10 @@ pub fn phase_2_configure_and_expand(sess: &Session, *sess.features.borrow_mut() = features; }); + time(time_passes, "recursion limit", (), |_| { + middle::recursion_limit::update_recursion_limit(sess, &krate); + }); + // strip before expansion to allow macros to depend on // configuration variables e.g/ in // |