Skip to content

Commit 87937d3

Browse files
borsbors
committed
Auto merge of rust-lang#96548 - Dylan-DPC:rollup-m3xkqxg, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - rust-lang#96477 (Update data layout string for wasm64-unknown-unknown) - rust-lang#96481 (HashMap doc: Don't use monospace font for 'Entry Api') - rust-lang#96492 (Revert "Re-export core::ffi types from std::ffi") - rust-lang#96516 (Revert diagnostic duplication and accidental stabilization) - rust-lang#96523 (Add ``@feat.00`` symbol to symbols.o for COFF) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 5560c51 + 48199e0 commit 87937d3

File tree

54 files changed

+158
-587
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+158
-587
lines changed

‎compiler/rustc_codegen_ssa/src/back/link.rs

+23
Original file line numberDiff line numberDiff line change
@@ -1700,6 +1700,29 @@ fn add_linked_symbol_object(
17001700
// We handle the name decoration of COFF targets in `symbol_export.rs`, so disable the
17011701
// default mangler in `object` crate.
17021702
file.set_mangling(object::write::Mangling::None);
1703+
1704+
// Add feature flags to the object file. On MSVC this is optional but LLD will complain if
1705+
// not present.
1706+
let mut feature = 0;
1707+
1708+
if file.architecture() == object::Architecture::I386 {
1709+
// Indicate that all SEH handlers are registered in .sxdata section.
1710+
// We don't have generate any code, so we don't need .sxdata section but LLD still
1711+
// expects us to set this bit (see #96498).
1712+
// Reference: https://docs.microsoft.com/en-us/windows/win32/debug/pe-format
1713+
feature |= 1;
1714+
}
1715+
1716+
file.add_symbol(object::write::Symbol {
1717+
name: "@feat.00".into(),
1718+
value: feature,
1719+
size: 0,
1720+
kind: object::SymbolKind::Data,
1721+
scope: object::SymbolScope::Compilation,
1722+
weak: false,
1723+
section: object::write::SymbolSection::Absolute,
1724+
flags: object::SymbolFlags::None,
1725+
});
17031726
}
17041727

17051728
for (sym, kind) in symbols.iter() {

‎compiler/rustc_target/src/spec/wasm64_unknown_unknown.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pub fn target() -> Target {
3636
Target {
3737
llvm_target: "wasm64-unknown-unknown".into(),
3838
pointer_width: 64,
39-
data_layout: "e-m:e-p:64:64-i64:64-n32:64-S128-ni:1:10:20".into(),
39+
data_layout: "e-m:e-p:64:64-p10:8:8-p20:8:8-i64:64-n32:64-S128-ni:1:10:20".into(),
4040
arch: "wasm64".into(),
4141
options,
4242
}

‎compiler/rustc_typeck/src/check/check.rs

+6
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,12 @@ pub(super) fn check_fn<'a, 'tcx>(
102102
DUMMY_SP,
103103
param_env,
104104
));
105+
// HACK(oli-obk): we rewrite the declared return type, too, so that we don't end up inferring all
106+
// unconstrained RPIT to have `()` as their hidden type. This would happen because further down we
107+
// compare the ret_coercion with declared_ret_ty, and anything uninferred would be inferred to the
108+
// opaque type itself. That again would cause writeback to assume we have a recursive call site
109+
// and do the sadly stabilized fallback to `()`.
110+
let declared_ret_ty = ret_ty;
105111
fcx.ret_coercion = Some(RefCell::new(CoerceMany::new(ret_ty)));
106112
fcx.ret_type_span = Some(decl.output.span());
107113

‎library/alloc/tests/c_str.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use std::borrow::Cow::{Borrowed, Owned};
2-
use std::ffi::{c_char, CStr};
2+
use std::ffi::CStr;
3+
use std::os::raw::c_char;
34

45
#[test]
56
fn to_str() {

‎library/std/src/collections/hash/map.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ use crate::sys;
136136
/// ]);
137137
/// ```
138138
///
139-
/// `HashMap` implements an [`Entry API`](#method.entry), which allows
139+
/// `HashMap` implements an [`Entry` API](#method.entry), which allows
140140
/// for complex methods of getting, setting, updating and removing keys and
141141
/// their values:
142142
///

‎library/std/src/ffi/mod.rs

-9
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,6 @@ pub use self::os_str::{OsStr, OsString};
171171
#[stable(feature = "core_c_void", since = "1.30.0")]
172172
pub use core::ffi::c_void;
173173

174-
#[unstable(feature = "core_ffi_c", issue = "94501")]
175-
pub use core::ffi::{
176-
c_char, c_double, c_float, c_int, c_long, c_longlong, c_schar, c_short, c_uchar, c_uint,
177-
c_ulong, c_ulonglong, c_ushort,
178-
};
179-
180-
#[unstable(feature = "c_size_t", issue = "88345")]
181-
pub use core::ffi::{c_ptrdiff_t, c_size_t, c_ssize_t};
182-
183174
#[unstable(
184175
feature = "c_variadic",
185176
reason = "the `c_variadic` feature has not been properly tested on \

‎library/std/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,6 @@
307307
// Only for re-exporting:
308308
#![feature(assert_matches)]
309309
#![feature(async_iterator)]
310-
#![feature(c_size_t)]
311310
#![feature(c_variadic)]
312311
#![feature(cfg_accessible)]
313312
#![feature(cfg_eval)]

‎src/test/run-make/issue-96498/Makefile

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# only-windows
2+
# needs-rust-lld
3+
4+
-include ../../run-make-fulldeps/tools.mk
5+
6+
# Ensure that LLD can link
7+
all:
8+
$(RUSTC) -C linker=rust-lld foo.rs

‎src/test/run-make/issue-96498/foo.rs

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#![crate_type = "cdylib"]
2+
3+
#[no_mangle]
4+
extern "C" fn foo() {}

‎src/test/ui/associated-types/impl-trait-return-missing-constraint.rs

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ fn bar() -> impl Bar {
2424

2525
fn baz() -> impl Bar<Item = i32> {
2626
//~^ ERROR type mismatch resolving `<impl Bar as Foo>::Item == i32`
27-
//~| ERROR type mismatch resolving `<impl Bar as Foo>::Item == i32`
2827
bar()
2928
}
3029

‎src/test/ui/associated-types/impl-trait-return-missing-constraint.stderr

+1-24
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,6 @@ help: consider constraining the associated type `<impl Bar as Foo>::Item` to `i3
1616
LL | fn bar() -> impl Bar<Item = i32> {
1717
| ++++++++++++
1818

19-
error[E0271]: type mismatch resolving `<impl Bar as Foo>::Item == i32`
20-
--> $DIR/impl-trait-return-missing-constraint.rs:25:34
21-
|
22-
LL | fn bar() -> impl Bar {
23-
| -------- the expected opaque type
24-
...
25-
LL | fn baz() -> impl Bar<Item = i32> {
26-
| __________________________________^
27-
LL | |
28-
LL | |
29-
LL | | bar()
30-
LL | | }
31-
| |_^ expected associated type, found `i32`
32-
|
33-
= note: expected associated type `<impl Bar as Foo>::Item`
34-
found type `i32`
35-
= help: consider constraining the associated type `<impl Bar as Foo>::Item` to `i32` or calling a method that returns `<impl Bar as Foo>::Item`
36-
= note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
37-
help: consider constraining the associated type `<impl Bar as Foo>::Item` to `i32`
38-
|
39-
LL | fn bar() -> impl Bar<Item = i32> {
40-
| ++++++++++++
41-
42-
error: aborting due to 2 previous errors
19+
error: aborting due to previous error
4320

4421
For more information about this error, try `rustc --explain E0271`.

‎src/test/ui/conservative_impl_trait.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
fn will_ice(something: &u32) -> impl Iterator<Item = &u32> {
44
//~^ ERROR `()` is not an iterator
5-
//~| ERROR `()` is not an iterator
65
}
76

87
fn main() {}

‎src/test/ui/conservative_impl_trait.stderr

+1-13
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,6 @@ LL | fn will_ice(something: &u32) -> impl Iterator<Item = &u32> {
66
|
77
= help: the trait `Iterator` is not implemented for `()`
88

9-
error[E0277]: `()` is not an iterator
10-
--> $DIR/conservative_impl_trait.rs:3:60
11-
|
12-
LL | fn will_ice(something: &u32) -> impl Iterator<Item = &u32> {
13-
| ____________________________________________________________^
14-
LL | |
15-
LL | |
16-
LL | | }
17-
| |_^ `()` is not an iterator
18-
|
19-
= help: the trait `Iterator` is not implemented for `()`
20-
21-
error: aborting due to 2 previous errors
9+
error: aborting due to previous error
2210

2311
For more information about this error, try `rustc --explain E0277`.

‎src/test/ui/const-generics/defaults/rp_impl_trait_fail.rs

-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ impl<const N: u32> Trait for Uwu<N> {}
55

66
fn rawr() -> impl Trait {
77
//~^ error: the trait bound `Uwu<10_u32, 12_u32>: Trait` is not satisfied
8-
//~| error: the trait bound `Uwu<10_u32, 12_u32>: Trait` is not satisfied
98
Uwu::<10, 12>
109
}
1110

@@ -17,13 +16,11 @@ impl Traitor<1, 2> for u64 {}
1716

1817
fn uwu<const N: u8>() -> impl Traitor<N> {
1918
//~^ error: the trait bound `u32: Traitor<N, N>` is not satisfied
20-
//~| error: the trait bound `u32: Traitor<N, N>` is not satisfied
2119
1_u32
2220
}
2321

2422
fn owo() -> impl Traitor {
2523
//~^ error: the trait bound `u64: Traitor<1_u8, 1_u8>` is not satisfied
26-
//~| error: the trait bound `u64: Traitor<1_u8, 1_u8>` is not satisfied
2724
1_u64
2825
}
2926

‎src/test/ui/const-generics/defaults/rp_impl_trait_fail.stderr

+3-46
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,8 @@ LL | fn rawr() -> impl Trait {
66
|
77
= help: the trait `Trait` is implemented for `Uwu<N>`
88

9-
error[E0277]: the trait bound `Uwu<10_u32, 12_u32>: Trait` is not satisfied
10-
--> $DIR/rp_impl_trait_fail.rs:6:25
11-
|
12-
LL | fn rawr() -> impl Trait {
13-
| _________________________^
14-
LL | |
15-
LL | |
16-
LL | | Uwu::<10, 12>
17-
LL | | }
18-
| |_^ the trait `Trait` is not implemented for `Uwu<10_u32, 12_u32>`
19-
|
20-
= help: the trait `Trait` is implemented for `Uwu<N>`
21-
229
error[E0277]: the trait bound `u32: Traitor<N, N>` is not satisfied
23-
--> $DIR/rp_impl_trait_fail.rs:18:26
10+
--> $DIR/rp_impl_trait_fail.rs:17:26
2411
|
2512
LL | fn uwu<const N: u8>() -> impl Traitor<N> {
2613
| ^^^^^^^^^^^^^^^ the trait `Traitor<N, N>` is not implemented for `u32`
@@ -29,23 +16,8 @@ LL | fn uwu<const N: u8>() -> impl Traitor<N> {
2916
<u32 as Traitor<N, 2_u8>>
3017
<u64 as Traitor<1_u8, 2_u8>>
3118

32-
error[E0277]: the trait bound `u32: Traitor<N, N>` is not satisfied
33-
--> $DIR/rp_impl_trait_fail.rs:18:42
34-
|
35-
LL | fn uwu<const N: u8>() -> impl Traitor<N> {
36-
| __________________________________________^
37-
LL | |
38-
LL | |
39-
LL | | 1_u32
40-
LL | | }
41-
| |_^ the trait `Traitor<N, N>` is not implemented for `u32`
42-
|
43-
= help: the following other types implement trait `Traitor<N, M>`:
44-
<u32 as Traitor<N, 2_u8>>
45-
<u64 as Traitor<1_u8, 2_u8>>
46-
4719
error[E0277]: the trait bound `u64: Traitor<1_u8, 1_u8>` is not satisfied
48-
--> $DIR/rp_impl_trait_fail.rs:24:13
20+
--> $DIR/rp_impl_trait_fail.rs:22:13
4921
|
5022
LL | fn owo() -> impl Traitor {
5123
| ^^^^^^^^^^^^ the trait `Traitor<1_u8, 1_u8>` is not implemented for `u64`
@@ -54,21 +26,6 @@ LL | fn owo() -> impl Traitor {
5426
<u32 as Traitor<N, 2_u8>>
5527
<u64 as Traitor<1_u8, 2_u8>>
5628

57-
error[E0277]: the trait bound `u64: Traitor<1_u8, 1_u8>` is not satisfied
58-
--> $DIR/rp_impl_trait_fail.rs:24:26
59-
|
60-
LL | fn owo() -> impl Traitor {
61-
| __________________________^
62-
LL | |
63-
LL | |
64-
LL | | 1_u64
65-
LL | | }
66-
| |_^ the trait `Traitor<1_u8, 1_u8>` is not implemented for `u64`
67-
|
68-
= help: the following other types implement trait `Traitor<N, M>`:
69-
<u32 as Traitor<N, 2_u8>>
70-
<u64 as Traitor<1_u8, 2_u8>>
71-
72-
error: aborting due to 6 previous errors
29+
error: aborting due to 3 previous errors
7330

7431
For more information about this error, try `rustc --explain E0277`.

‎src/test/ui/generator/issue-88653.rs

-3
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,10 @@ use std::ops::Generator;
77

88
fn foo(bar: bool) -> impl Generator<(bool,)> {
99
//~^ ERROR: type mismatch in generator arguments [E0631]
10-
//~| ERROR: type mismatch in generator arguments [E0631]
11-
//~| NOTE: expected signature of `fn((bool,)) -> _`
1210
//~| NOTE: expected signature of `fn((bool,)) -> _`
1311
//~| NOTE: in this expansion of desugaring of `impl Trait`
1412
|bar| {
1513
//~^ NOTE: found signature of `fn(bool) -> _`
16-
//~| NOTE: found signature of `fn(bool) -> _`
1714
if bar {
1815
yield bar;
1916
}

‎src/test/ui/generator/issue-88653.stderr

+1-17
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,6 @@ LL | fn foo(bar: bool) -> impl Generator<(bool,)> {
77
LL | |bar| {
88
| ----- found signature of `fn(bool) -> _`
99

10-
error[E0631]: type mismatch in generator arguments
11-
--> $DIR/issue-88653.rs:8:46
12-
|
13-
LL | fn foo(bar: bool) -> impl Generator<(bool,)> {
14-
| ______________________________________________^
15-
LL | |
16-
LL | |
17-
LL | |
18-
... |
19-
LL | | |bar| {
20-
| | ----- found signature of `fn(bool) -> _`
21-
... |
22-
LL | | }
23-
LL | | }
24-
| |_^ expected signature of `fn((bool,)) -> _`
25-
26-
error: aborting due to 2 previous errors
10+
error: aborting due to previous error
2711

2812
For more information about this error, try `rustc --explain E0631`.

‎src/test/ui/generator/type-mismatch-signature-deduction.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use std::ops::Generator;
44

55
fn foo() -> impl Generator<Return = i32> {
66
//~^ ERROR type mismatch
7-
//~| ERROR type mismatch
87
|| {
98
if false {
109
return Ok(6);

‎src/test/ui/generator/type-mismatch-signature-deduction.stderr

+4-20
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
error[E0308]: mismatched types
2-
--> $DIR/type-mismatch-signature-deduction.rs:15:9
2+
--> $DIR/type-mismatch-signature-deduction.rs:14:9
33
|
44
LL | 5
55
| ^ expected enum `Result`, found integer
66
|
77
= note: expected type `Result<{integer}, _>`
88
found type `{integer}`
99
note: return type inferred to be `Result<{integer}, _>` here
10-
--> $DIR/type-mismatch-signature-deduction.rs:10:20
10+
--> $DIR/type-mismatch-signature-deduction.rs:9:20
1111
|
1212
LL | return Ok(6);
1313
| ^^^^^
1414

15-
error[E0271]: type mismatch resolving `<[generator@$DIR/type-mismatch-signature-deduction.rs:8:5: 16:6] as Generator>::Return == i32`
15+
error[E0271]: type mismatch resolving `<[generator@$DIR/type-mismatch-signature-deduction.rs:7:5: 15:6] as Generator>::Return == i32`
1616
--> $DIR/type-mismatch-signature-deduction.rs:5:13
1717
|
1818
LL | fn foo() -> impl Generator<Return = i32> {
@@ -21,23 +21,7 @@ LL | fn foo() -> impl Generator<Return = i32> {
2121
= note: expected enum `Result<{integer}, _>`
2222
found type `i32`
2323

24-
error[E0271]: type mismatch resolving `<[generator@$DIR/type-mismatch-signature-deduction.rs:8:5: 16:6] as Generator>::Return == i32`
25-
--> $DIR/type-mismatch-signature-deduction.rs:5:42
26-
|
27-
LL | fn foo() -> impl Generator<Return = i32> {
28-
| __________________________________________^
29-
LL | |
30-
LL | |
31-
LL | | || {
32-
... |
33-
LL | | }
34-
LL | | }
35-
| |_^ expected enum `Result`, found `i32`
36-
|
37-
= note: expected enum `Result<{integer}, _>`
38-
found type `i32`
39-
40-
error: aborting due to 3 previous errors
24+
error: aborting due to 2 previous errors
4125

4226
Some errors have detailed explanations: E0271, E0308.
4327
For more information about an error, try `rustc --explain E0271`.

‎src/test/ui/impl-trait/bound-normalization-fail.rs

-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ mod impl_trait {
2424
/// `T::Assoc` can't be normalized any further here.
2525
fn foo_fail<T: Trait>() -> impl FooLike<Output = T::Assoc> {
2626
//~^ ERROR: type mismatch
27-
//~| ERROR: type mismatch
2827
Foo(())
2928
}
3029
}
@@ -42,7 +41,6 @@ mod lifetimes {
4241
fn foo2_fail<'a, T: Trait<'a>>() -> impl FooLike<Output = T::Assoc> {
4342
//~^ ERROR `impl Trait` return type cannot contain a projection or `Self` that references lifetimes from a parent scope
4443
//~| ERROR: type mismatch
45-
//~| ERROR: type mismatch
4644
Foo(())
4745
}
4846
}

0 commit comments

Comments
 (0)