user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #112055 - matthiaskrgr:rollup-y3exx8c, r=matthiaskrgr

Browse source 
Rollup of 5 pull requests

Successful merges:

 - #112029 (Recover upon mistyped error on typo'd `const` in const param def)
 - #112037 (Add details about `unsafe_op_in_unsafe_fn` to E0133)
 - #112039 (compiler: update solaris/illumos to enable tsan support.)
 - #112042 (Migrate GUI colors test to original CSS color format)
 - #112045 (Followup to #111973)

r? `@ghost`
`@rustbot` modify labels: rollup
This commit is contained in:
bors 2023-05-29 03:04:06 +00:00
commit dc0943d2ee
8 changed files with 135 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/rustdoc-gui/search-result-display.goml
View file

@ -57,22 +57,22 @@ define-function: (
call-function: ("check-filter", {
"theme": "ayu",
"border": "rgb(92, 103, 115)",
"border": "#5c6773",
"filter": "invert(0.41) sepia(0.12) saturate(4.87) hue-rotate(171deg) brightness(0.94) contrast(0.94)",
"hover_border": "rgb(224, 224, 224)",
"hover_border": "#e0e0e0",
"hover_filter": "invert(0.98) sepia(0.12) saturate(0.81) hue-rotate(343deg) brightness(1.13) contrast(0.76)",
})
call-function: ("check-filter", {
"theme": "dark",
"border": "rgb(224, 224, 224)",
"border": "#e0e0e0",
"filter": "invert(0.94) sepia(0) saturate(7.21) hue-rotate(255deg) brightness(0.9) contrast(0.9)",
"hover_border": "rgb(33, 150, 243)",
"hover_border": "#2196f3",
"hover_filter": "invert(0.69) sepia(0.6) saturate(66.13) hue-rotate(184deg) brightness(1) contrast(0.91)",
})
call-function: ("check-filter", {
"theme": "light",
"border": "rgb(224, 224, 224)",
"border": "#e0e0e0",
"filter": "invert(1) sepia(0) saturate(42.23) hue-rotate(289deg) brightness(1.14) contrast(0.76)",
"hover_border": "rgb(113, 113, 113)",
"hover_border": "#717171",
"hover_filter": "invert(0.44) sepia(0.18) saturate(0.23) hue-rotate(317deg) brightness(0.96) contrast(0.93)",
})

16
tests/ui/parser/typod-const-in-const-param-def.rs Normal file
View file

@ -0,0 +1,16 @@
pub fn foo<Const N: u8>() {}
//~^ ERROR `const` keyword was mistyped as `Const`
pub fn bar<Const>() {}
// OK
pub fn baz<Const N: u8, T>() {}
//~^ ERROR `const` keyword was mistyped as `Const`
pub fn qux<T, Const N: u8>() {}
//~^ ERROR `const` keyword was mistyped as `Const`
pub fn quux<T, Const N: u8, U>() {}
//~^ ERROR `const` keyword was mistyped as `Const`
fn main() {}

46
tests/ui/parser/typod-const-in-const-param-def.stderr Normal file
View file

@ -0,0 +1,46 @@
error: `const` keyword was mistyped as `Const`
--> $DIR/typod-const-in-const-param-def.rs:1:12
|
LL | pub fn foo<Const N: u8>() {}
| ^^^^^
|
help: use the `const` keyword
|
LL | pub fn foo<const N: u8>() {}
| ~~~~~
error: `const` keyword was mistyped as `Const`
--> $DIR/typod-const-in-const-param-def.rs:7:12
|
LL | pub fn baz<Const N: u8, T>() {}
| ^^^^^
|
help: use the `const` keyword
|
LL | pub fn baz<const N: u8, T>() {}
| ~~~~~
error: `const` keyword was mistyped as `Const`
--> $DIR/typod-const-in-const-param-def.rs:10:15
|
LL | pub fn qux<T, Const N: u8>() {}
| ^^^^^
|
help: use the `const` keyword
|
LL | pub fn qux<T, const N: u8>() {}
| ~~~~~
error: `const` keyword was mistyped as `Const`
--> $DIR/typod-const-in-const-param-def.rs:13:16
|
LL | pub fn quux<T, Const N: u8, U>() {}
| ^^^^^
|
help: use the `const` keyword
|
LL | pub fn quux<T, const N: u8, U>() {}
| ~~~~~
error: aborting due to 4 previous errors