diff options
| author | The Miri Cronjob Bot <miri@cron.bot> | 2025-06-05 05:02:35 +0000 |
|---|---|---|
| committer | The Miri Cronjob Bot <miri@cron.bot> | 2025-06-05 05:02:35 +0000 |
| commit | bd898e38afecfd1c2ae30067e6170bda8a8c4db6 (patch) | |
| tree | 298b738d03e31ec9228ddac11ef2854dcbb54e5b /src/tools | |
| parent | 869baeaf9207e86fa9a8e8a3319d7ae080e4a07c (diff) | |
| parent | fa282f4928f88060159f8599106c055ba0c94a19 (diff) | |
| download | rust-bd898e38afecfd1c2ae30067e6170bda8a8c4db6.tar.gz rust-bd898e38afecfd1c2ae30067e6170bda8a8c4db6.zip | |
Merge from rustc
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/clippy/clippy_utils/src/ast_utils/mod.rs | 4 | ||||
| -rw-r--r-- | src/tools/miri/src/alloc/isolated_alloc.rs | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/tools/clippy/clippy_utils/src/ast_utils/mod.rs b/src/tools/clippy/clippy_utils/src/ast_utils/mod.rs index 6c186ab4a6f..e65914b9b5e 100644 --- a/src/tools/clippy/clippy_utils/src/ast_utils/mod.rs +++ b/src/tools/clippy/clippy_utils/src/ast_utils/mod.rs @@ -960,5 +960,7 @@ pub fn eq_attr_args(l: &AttrArgs, r: &AttrArgs) -> bool { } pub fn eq_delim_args(l: &DelimArgs, r: &DelimArgs) -> bool { - l.delim == r.delim && l.tokens.eq_unspanned(&r.tokens) + l.delim == r.delim + && l.tokens.len() == r.tokens.len() + && l.tokens.iter().zip(r.tokens.iter()).all(|(a, b)| a.eq_unspanned(b)) } diff --git a/src/tools/miri/src/alloc/isolated_alloc.rs b/src/tools/miri/src/alloc/isolated_alloc.rs index 7b74d171373..3a7879f372a 100644 --- a/src/tools/miri/src/alloc/isolated_alloc.rs +++ b/src/tools/miri/src/alloc/isolated_alloc.rs @@ -145,10 +145,7 @@ impl IsolatedAlloc { if pinfo.domain_size() < offset_pinfo + size_pinfo { break; } - // FIXME: is there a more efficient way to check whether the entire range is unset - // in the bitset? - let range_avail = !(offset_pinfo..offset_pinfo + size_pinfo).any(|i| pinfo.contains(i)); - if range_avail { + if !pinfo.contains_any(offset_pinfo..offset_pinfo + size_pinfo) { pinfo.insert_range(offset_pinfo..offset_pinfo + size_pinfo); // SAFETY: We checked the available bytes after `idx` in the call // to `domain_size` above and asserted there are at least `idx + |