]> git.lizzy.rs Git - rust.git/commit - src/tools/miri
Rollup merge of #101826 - andrewpollack:fix-joined-without-noop, r=Mark-Simulacrum
authorMatthias Krüger <matthias.krueger@famsik.de>
Sat, 17 Sep 2022 21:30:50 +0000 (23:30 +0200)
committerGitHub <noreply@github.com>
Sat, 17 Sep 2022 21:30:50 +0000 (23:30 +0200)
commitbfbb15a47915e10c92ec85308993b00c593976a4
tree5aebd998aa79d1b571800afbb8b6e42a17cb0922
parent36b066daa45e17b0590bddb619a0f0ffcaf33b05
parent4279bd56fc3598fa129759efb4bc466dcfc06348
Rollup merge of #101826 - andrewpollack:fix-joined-without-noop, r=Mark-Simulacrum

Enforce "joined()" and "joined_with_noop()" test

Several similar tests come in the form of `joined()` and `joined_with_noop()`. In this test, the `joined()` has two calls to a noop, making it functionally equivalent to `joined_with_noop()`. This doesn't seem intended, and this PR removes those calls and changes the memory size to reflect the change

For my education, why do tests with `noop()` calls sometimes have `noop()` contributing to the size, while others do not? E.g. https://github.com/rust-lang/rust/blob/master/src/test/ui/async-await/async-fn-size-moved-locals.rs#L115 and https://github.com/rust-lang/rust/blob/master/src/test/ui/async-await/async-fn-size-moved-locals.rs#L116 have no size difference, whereas https://github.com/rust-lang/rust/blob/master/src/test/ui/async-await/async-fn-size-moved-locals.rs#L113 and https://github.com/rust-lang/rust/blob/master/src/test/ui/async-await/async-fn-size-moved-locals.rs#L114 have a size difference. Thank you!