Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 10 pull requests #121845

Closed
wants to merge 24 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ee61f09
Add arm64ec-pc-windows-msvc target
dpaoliello Dec 16, 2023
a9907b1
remove Mutex::unlock
HTGAzureX1212 Feb 28, 2024
4996194
Improve error messages for generics with default parameters
veera-sivarajan Feb 21, 2024
3ba50b3
Avoid code duplication
veera-sivarajan Feb 23, 2024
cc13f82
Update item order in test
veera-sivarajan Feb 23, 2024
a7832b1
Make the success arms of `if lhs || rhs` meet up in a separate block
Zalathar Feb 28, 2024
f11713b
Error on stray .stderr/.stdout files for (un-)revisioned tests
jieyouxu Feb 22, 2024
19ee457
Remove stray stdout/stderr files
jieyouxu Feb 22, 2024
721c741
Remove unnecessary `Level::` qualifiers.
nnethercote Feb 29, 2024
7e64163
CFI: Remove unused `typeid_for_fnsig`
rcvalle Feb 29, 2024
44f0043
Handle stashing of delayed bugs.
nnethercote Feb 29, 2024
2064c19
Remove unused fluent messages
mu001999 Mar 1, 2024
beac5b1
Fix typo in comment
gurry Mar 1, 2024
836ac98
Stop using Bubble in coherence and instead emulate it with an intercr…
oli-obk Feb 28, 2024
c37e563
Rollup merge of #119199 - dpaoliello:arm64ec, r=wesleywiser
matthiaskrgr Mar 1, 2024
f96e827
Rollup merge of #121416 - veera-sivarajan:bugfix-120785, r=nnethercote
matthiaskrgr Mar 1, 2024
a41f73b
Rollup merge of #121475 - jieyouxu:tidy-stderr-check, r=the8472,compi…
matthiaskrgr Mar 1, 2024
bd2a33e
Rollup merge of #121736 - HTGAzureX1212:HTGAzureX1212/remove-mutex-un…
matthiaskrgr Mar 1, 2024
b6db351
Rollup merge of #121744 - oli-obk:eager_opaque_checks2, r=lcnr
matthiaskrgr Mar 1, 2024
4fc2b99
Rollup merge of #121784 - Zalathar:if-or-converge, r=Nadrieril
matthiaskrgr Mar 1, 2024
e55bb02
Rollup merge of #121818 - rcvalle:rust-cfi-remove-unused-typeid-for-f…
matthiaskrgr Mar 1, 2024
badfb16
Rollup merge of #121819 - nnethercote:fix-121812, r=oli-obk
matthiaskrgr Mar 1, 2024
6be5eb8
Rollup merge of #121828 - mu001999:clean, r=Nilstrieb
matthiaskrgr Mar 1, 2024
516e844
Rollup merge of #121831 - gurry:fix-typo, r=oli-obk
matthiaskrgr Mar 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update item order in test
  • Loading branch information
veera-sivarajan committed Feb 29, 2024
commit cc13f8278f22243a6ecd82d062c4740787a0fc51
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ fn main() {
let c: What<usize, String> = What(1, String::from("meow"));
b = c; //~ ERROR mismatched types

let mut e: What<usize> = What(5, vec![1, 2, 3]);
let f: What<usize, Vec<String>> = What(1, vec![String::from("meow")]);
e = f; //~ ERROR mismatched types
let mut f: What<usize, Vec<String>> = What(1, vec![String::from("meow")]);
let e: What<usize> = What(5, vec![1, 2, 3]);
f = e; //~ ERROR mismatched types
}
Original file line number Diff line number Diff line change
@@ -13,14 +13,14 @@ LL | b = c;
error[E0308]: mismatched types
--> $DIR/clarify-error-for-generics-with-default-issue-120785.rs:10:9
|
LL | let mut e: What<usize> = What(5, vec![1, 2, 3]);
| ----------- expected due to this type
LL | let f: What<usize, Vec<String>> = What(1, vec![String::from("meow")]);
LL | e = f;
| ^ expected `What`, found `What<usize, Vec<String>>`
LL | let mut f: What<usize, Vec<String>> = What(1, vec![String::from("meow")]);
| ------------------------ expected due to this type
LL | let e: What<usize> = What(5, vec![1, 2, 3]);
LL | f = e;
| ^ expected `What<usize, Vec<String>>`, found `What`
|
= note: expected struct `What<_, Vec<usize>>`
found struct `What<_, Vec<String>>`
= note: expected struct `What<_, Vec<String>>`
found struct `What<_, Vec<usize>>`

error: aborting due to 2 previous errors