diff options
| author | bors <bors@rust-lang.org> | 2024-03-03 14:01:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-03-03 14:01:47 +0000 |
| commit | 26907374b9478d84d766aea85b10b51af8dbcce8 (patch) | |
| tree | be19b487d32e4a2a022f3bde10e3b36aa61e1630 /compiler/rustc_middle/src | |
| parent | 9e73597e5a83e96e223c10b3810566c74a86a0c1 (diff) | |
| parent | e634a0a51b088bd8df4e07d2f2666daabb01e338 (diff) | |
| download | rust-26907374b9478d84d766aea85b10b51af8dbcce8.tar.gz rust-26907374b9478d84d766aea85b10b51af8dbcce8.zip | |
Auto merge of #121937 - GuillaumeGomez:rollup-9684vg3, r=GuillaumeGomez
Rollup of 3 pull requests Successful merges: - #121917 (Add new `pattern_complexity` attribute to add possibility to limit and check recursion in pattern matching) - #121933 (Add missing get_name for wasm::thread.) - #121934 (rustc_log: expose tracing-tree "wraparound" in an env var) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_middle/src')
| -rw-r--r-- | compiler/rustc_middle/src/middle/limits.rs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/compiler/rustc_middle/src/middle/limits.rs b/compiler/rustc_middle/src/middle/limits.rs index 344ea38192e..4d698012749 100644 --- a/compiler/rustc_middle/src/middle/limits.rs +++ b/compiler/rustc_middle/src/middle/limits.rs @@ -40,6 +40,13 @@ pub fn get_recursion_limit(krate_attrs: &[Attribute], sess: &Session) -> Limit { } fn get_limit(krate_attrs: &[Attribute], sess: &Session, name: Symbol, default: usize) -> Limit { + match get_limit_size(krate_attrs, sess, name) { + Some(size) => Limit::new(size), + None => Limit::new(default), + } +} + +pub fn get_limit_size(krate_attrs: &[Attribute], sess: &Session, name: Symbol) -> Option<usize> { for attr in krate_attrs { if !attr.has_name(name) { continue; @@ -47,7 +54,7 @@ fn get_limit(krate_attrs: &[Attribute], sess: &Session, name: Symbol, default: u if let Some(s) = attr.value_str() { match s.as_str().parse() { - Ok(n) => return Limit::new(n), + Ok(n) => return Some(n), Err(e) => { let value_span = attr .meta() @@ -69,5 +76,5 @@ fn get_limit(krate_attrs: &[Attribute], sess: &Session, name: Symbol, default: u } } } - return Limit::new(default); + None } |
