Unnamed repository; edit this file 'description' to name the repository.
Merge ref 'f41f40408d71' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: f41f40408d719aa9ae0c6bfa17619d8f3f9e5b99 Filtered ref: 5abf37848786e70eb8136f43225b3470afea6dea Upstream diff: https://github.com/rust-lang/rust/compare/0208ee09be465f69005a7a12c28d5eccac7d5f34...f41f40408d719aa9ae0c6bfa17619d8f3f9e5b99 This merge was created using https://github.com/rust-lang/josh-sync.
The rustc-josh-sync Cronjob Bot 4 months ago
parent f511edf · parent 5abf378 · commit 0a5311a
-rw-r--r--crates/hir-ty/src/layout/tests/closure.rs8
1 files changed, 8 insertions, 0 deletions
diff --git a/crates/hir-ty/src/layout/tests/closure.rs b/crates/hir-ty/src/layout/tests/closure.rs
index 6c76c6fed0..9e761aa98f 100644
--- a/crates/hir-ty/src/layout/tests/closure.rs
+++ b/crates/hir-ty/src/layout/tests/closure.rs
@@ -166,6 +166,9 @@ fn capture_specific_fields() {
*a + x + (*b as i64)
}
}
+ // FIXME: These tests currently fail, because rust-analyzer hasn't yet implemented the changes
+ // introduced in rust-lang/rust#138961. See rust-lang/rust-analyzer#21274 for more discussion.
+ /*
size_and_align_expr! {
struct X(i64, i32, (u8, i128));
let y: X = X(2, 5, (7, 3));
@@ -183,6 +186,7 @@ fn capture_specific_fields() {
a + x + (b as i64)
}
}
+ */
}
#[test]
@@ -194,6 +198,9 @@ fn match_pattern() {
x
}
}
+ // FIXME: These tests currently fail, because rust-analyzer hasn't yet implemented the changes
+ // introduced in rust-lang/rust#138961. See rust-lang/rust-analyzer#21274 for more discussion.
+ /*
size_and_align_expr! {
minicore: copy;
stmts: [
@@ -206,6 +213,7 @@ fn match_pattern() {
}
}
}
+ */
size_and_align_expr! {
minicore: copy;
stmts: [