Merge pull request #255 from rust-lang/sync_from_rust_2023_feb_28_2

Sync from rust 2023 feb 28

Author: antoyo

.github/workflows/ci.yml

@@ -108,14 +108,14 @@ jobs:
         path: target
         key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('rust-toolchain') }}
 
-    - name: Cache rust repository
-      # We only clone the rust repository for rustc tests
-      if: ${{ contains(matrix.commands, 'rustc') }}
-      uses: actions/cache@v3
-      id: cache-rust-repository
-      with:
-        path: rust
-        key: ${{ runner.os }}-packages-${{ hashFiles('rust/.git/HEAD') }}
+    #- name: Cache rust repository
+      ## We only clone the rust repository for rustc tests
+      #if: ${{ contains(matrix.commands, 'rustc') }}
+      #uses: actions/cache@v3
+      #id: cache-rust-repository
+      #with:
+        #path: rust
+        #key: ${{ runner.os }}-packages-${{ hashFiles('rust/.git/HEAD') }}
 
     - name: Build
       run: |

Cargo.lock

@@ -28,9 +28,6 @@ gccjit = { git = "https://github.com/antoyo/gccjit.rs" }
 #gccjit = { path = "../gccjit.rs" }
 
 smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
-target-lexicon = "0.10.0"
-
-ar = "0.8.0"
 
 [dev-dependencies]
 lang_tester = "0.3.9"

Cargo.toml

@@ -13,17 +13,17 @@
 
 // The minimum alignment guaranteed by the architecture. This value is used to
 // add fast paths for low alignment values.
-#[cfg(all(any(target_arch = "x86",
+#[cfg(any(target_arch = "x86",
               target_arch = "arm",
               target_arch = "mips",
               target_arch = "powerpc",
-              target_arch = "powerpc64")))]
+              target_arch = "powerpc64"))]
 const MIN_ALIGN: usize = 8;
-#[cfg(all(any(target_arch = "x86_64",
+#[cfg(any(target_arch = "x86_64",
               target_arch = "aarch64",
               target_arch = "mips64",
               target_arch = "s390x",
-              target_arch = "sparc64")))]
+              target_arch = "sparc64"))]
 const MIN_ALIGN: usize = 16;
 
 pub struct System;

example/alloc_system.rs

@@ -17,6 +17,9 @@ pub trait Sized {}
 #[lang = "destruct"]
 pub trait Destruct {}
 
+#[lang = "tuple_trait"]
+pub trait Tuple {}
+
 #[lang = "unsize"]
 pub trait Unsize<T: ?Sized> {}
 
@@ -396,7 +399,7 @@ pub struct PhantomData<T: ?Sized>;
 
 #[lang = "fn_once"]
 #[rustc_paren_sugar]
-pub trait FnOnce<Args> {
+pub trait FnOnce<Args: Tuple> {
     #[lang = "fn_once_output"]
     type Output;
 
@@ -405,7 +408,7 @@ pub trait FnOnce<Args> {
 
 #[lang = "fn_mut"]
 #[rustc_paren_sugar]
-pub trait FnMut<Args>: FnOnce<Args> {
+pub trait FnMut<Args: Tuple>: FnOnce<Args> {
     extern "rust-call" fn call_mut(&mut self, args: Args) -> Self::Output;
 }
 
@@ -418,8 +421,8 @@ pub fn panic(_msg: &'static str) -> ! {
     }
 }
 
-#[lang = "panic_no_unwind"]
-fn panic_no_unwind() -> ! {
+#[lang = "panic_cannot_unwind"]
+fn panic_cannot_unwind() -> ! {
     unsafe {
         libc::puts("Panicking\n\0" as *const str as *const u8);
         intrinsics::abort();
@@ -531,16 +534,22 @@ pub mod intrinsics {
     use crate::Sized;
 
     extern "rust-intrinsic" {
+        #[rustc_safe_intrinsic]
         pub fn abort() -> !;
+        #[rustc_safe_intrinsic]
         pub fn size_of<T>() -> usize;
         pub fn size_of_val<T: ?Sized>(val: *const T) -> usize;
+        #[rustc_safe_intrinsic]
         pub fn min_align_of<T>() -> usize;
         pub fn min_align_of_val<T: ?Sized>(val: *const T) -> usize;
         pub fn copy<T>(src: *const T, dst: *mut T, count: usize);
         pub fn transmute<T, U>(e: T) -> U;
         pub fn ctlz_nonzero<T>(x: T) -> T;
+        #[rustc_safe_intrinsic]
         pub fn needs_drop<T: ?Sized>() -> bool;
+        #[rustc_safe_intrinsic]
         pub fn bitreverse<T>(x: T) -> T;
+        #[rustc_safe_intrinsic]
         pub fn bswap<T>(x: T) -> T;
         pub fn write_bytes<T>(dst: *mut T, val: u8, count: usize);
         pub fn unreachable() -> !;

example/mini_core.rs

@@ -85,6 +85,7 @@ fn start<T: Termination + 'static>(
     main: fn() -> T,
     argc: isize,
     argv: *const *const u8,
+    _sigpipe: u8,
 ) -> isize {
     if argc == 3 {
         unsafe { puts(*argv); }

example/mini_core_hello_world.rs

@@ -1,60 +1,68 @@
-src/test/ui/alloc-error/default-alloc-error-hook.rs
-src/test/ui/allocator/custom-in-block.rs
-src/test/ui/allocator/custom-in-submodule.rs
-src/test/ui/allocator/custom.rs
-src/test/ui/allocator/hygiene.rs
-src/test/ui/allocator/no_std-alloc-error-handler-custom.rs
-src/test/ui/allocator/no_std-alloc-error-handler-default.rs
-src/test/ui/allocator/xcrate-use.rs
-src/test/ui/allocator/xcrate-use2.rs
-src/test/ui/asm/may_unwind.rs
-src/test/ui/asm/x86_64/multiple-clobber-abi.rs
-src/test/ui/debuginfo/debuginfo-emit-llvm-ir-and-split-debuginfo.rs
-src/test/ui/functions-closures/parallel-codegen-closures.rs
-src/test/ui/linkage-attr/linkage1.rs
-src/test/ui/lto/dylib-works.rs
-src/test/ui/numbers-arithmetic/saturating-float-casts.rs
-src/test/ui/polymorphization/promoted-function.rs
-src/test/ui/process/nofile-limit.rs
-src/test/ui/sepcomp/sepcomp-cci.rs
-src/test/ui/sepcomp/sepcomp-extern.rs
-src/test/ui/sepcomp/sepcomp-fns-backwards.rs
-src/test/ui/sepcomp/sepcomp-fns.rs
-src/test/ui/sepcomp/sepcomp-statics.rs
-src/test/ui/simd/intrinsic/generic-arithmetic-pass.rs
-src/test/ui/sse2.rs
-src/test/ui/target-feature/missing-plusminus.rs
-src/test/ui/asm/x86_64/may_unwind.rs
-src/test/ui/backtrace.rs
-src/test/ui/catch-unwind-bang.rs
-src/test/ui/cfg/cfg-panic-abort.rs
-src/test/ui/drop/dynamic-drop-async.rs
-src/test/ui/drop/repeat-drop.rs
-src/test/ui/fmt/format-args-capture.rs
-src/test/ui/generator/panic-drops-resume.rs
-src/test/ui/generator/panic-drops.rs
-src/test/ui/generator/panic-safe.rs
-src/test/ui/intrinsics/panic-uninitialized-zeroed.rs
-src/test/ui/iterators/iter-sum-overflow-debug.rs
-src/test/ui/iterators/iter-sum-overflow-overflow-checks.rs
-src/test/ui/mir/mir_calls_to_shims.rs
-src/test/ui/mir/mir_drop_order.rs
-src/test/ui/mir/mir_let_chains_drop_order.rs
-src/test/ui/oom_unwind.rs
-src/test/ui/panic-runtime/abort-link-to-unwinding-crates.rs
-src/test/ui/panic-runtime/abort.rs
-src/test/ui/panic-runtime/link-to-abort.rs
-src/test/ui/unwind-no-uwtable.rs
-src/test/ui/issues/issue-14875.rs
-src/test/ui/issues/issue-29948.rs
-src/test/ui/issues/issue-40883.rs
-src/test/ui/issues/issue-43853.rs
-src/test/ui/issues/issue-47364.rs
-src/test/ui/simd/issue-17170.rs
-src/test/ui/simd/issue-39720.rs
-src/test/ui/simd/issue-89193.rs
-src/test/ui/statics/issue-91050-1.rs
-src/test/ui/statics/issue-91050-2.rs
-src/test/ui/macros/rfc-2011-nicer-assert-messages/assert-without-captures-does-not-create-unnecessary-code.rs
-src/test/ui/rfc-2091-track-caller/std-panic-locations.rs
-src/test/ui/rfcs/rfc1857-drop-order.rs
+tests/ui/allocator/custom-in-block.rs
+tests/ui/allocator/custom-in-submodule.rs
+tests/ui/allocator/custom.rs
+tests/ui/allocator/hygiene.rs
+tests/ui/allocator/no_std-alloc-error-handler-custom.rs
+tests/ui/allocator/no_std-alloc-error-handler-default.rs
+tests/ui/allocator/xcrate-use.rs
+tests/ui/allocator/xcrate-use2.rs
+tests/ui/asm/may_unwind.rs
+tests/ui/asm/x86_64/multiple-clobber-abi.rs
+tests/ui/debuginfo/debuginfo-emit-llvm-ir-and-split-debuginfo.rs
+tests/ui/functions-closures/parallel-codegen-closures.rs
+tests/ui/linkage-attr/linkage1.rs
+tests/ui/lto/dylib-works.rs
+tests/ui/numbers-arithmetic/saturating-float-casts.rs
+tests/ui/polymorphization/promoted-function.rs
+tests/ui/process/nofile-limit.rs
+tests/ui/sepcomp/sepcomp-cci.rs
+tests/ui/sepcomp/sepcomp-extern.rs
+tests/ui/sepcomp/sepcomp-fns-backwards.rs
+tests/ui/sepcomp/sepcomp-fns.rs
+tests/ui/sepcomp/sepcomp-statics.rs
+tests/ui/simd/intrinsic/generic-arithmetic-pass.rs
+tests/ui/sse2.rs
+tests/ui/target-feature/missing-plusminus.rs
+tests/ui/asm/x86_64/may_unwind.rs
+tests/ui/backtrace.rs
+tests/ui/catch-unwind-bang.rs
+tests/ui/cfg/cfg-panic-abort.rs
+tests/ui/drop/dynamic-drop-async.rs
+tests/ui/drop/repeat-drop.rs
+tests/ui/fmt/format-args-capture.rs
+tests/ui/generator/panic-drops-resume.rs
+tests/ui/generator/panic-drops.rs
+tests/ui/intrinsics/panic-uninitialized-zeroed.rs
+tests/ui/iterators/iter-sum-overflow-debug.rs
+tests/ui/iterators/iter-sum-overflow-overflow-checks.rs
+tests/ui/mir/mir_calls_to_shims.rs
+tests/ui/mir/mir_drop_order.rs
+tests/ui/mir/mir_let_chains_drop_order.rs
+tests/ui/oom_unwind.rs
+tests/ui/panic-runtime/abort-link-to-unwinding-crates.rs
+tests/ui/panic-runtime/abort.rs
+tests/ui/panic-runtime/link-to-abort.rs
+tests/ui/unwind-no-uwtable.rs
+tests/ui/parser/unclosed-delimiter-in-dep.rs
+tests/ui/runtime/rt-explody-panic-payloads.rs
+tests/ui/simd/intrinsic/ptr-cast.rs
+tests/ui/binding/fn-arg-incomplete-pattern-drop-order.rs
+tests/ui/consts/missing_span_in_backtrace.rs
+tests/ui/drop/dynamic-drop.rs
+tests/ui/dyn-star/box.rs
+tests/ui/issues/issue-40883.rs
+tests/ui/issues/issue-43853.rs
+tests/ui/issues/issue-47364.rs
+tests/ui/macros/rfc-2011-nicer-assert-messages/assert-without-captures-does-not-create-unnecessary-code.rs
+tests/ui/rfc-2091-track-caller/std-panic-locations.rs
+tests/ui/rfcs/rfc1857-drop-order.rs
+tests/ui/simd/issue-17170.rs
+tests/ui/simd/issue-39720.rs
+tests/ui/simd/issue-89193.rs
+tests/ui/statics/issue-91050-1.rs
+tests/ui/statics/issue-91050-2.rs
+tests/ui/alloc-error/default-alloc-error-hook.rs
+tests/ui/generator/panic-safe.rs
+tests/ui/issues/issue-14875.rs
+tests/ui/issues/issue-29948.rs
+tests/ui/panic-while-printing.rs

failing-ui-tests.txt

@@ -1,41 +1,39 @@
-src/test/ui/asm/x86_64/issue-96797.rs
-src/test/ui/intrinsics/const-eval-select-x86_64.rs
-src/test/ui/packed/packed-struct-drop-aligned.rs
-src/test/ui/packed/packed-struct-generic-layout.rs
-src/test/ui/packed/packed-struct-layout.rs
-src/test/ui/packed/packed-struct-optimized-enum.rs
-src/test/ui/packed/packed-struct-size.rs
-src/test/ui/packed/packed-struct-vec.rs
-src/test/ui/packed/packed-tuple-struct-layout.rs
-src/test/ui/simd/array-type.rs
-src/test/ui/simd/intrinsic/float-minmax-pass.rs
-src/test/ui/simd/intrinsic/generic-arithmetic-saturating-pass.rs
-src/test/ui/simd/intrinsic/generic-as.rs
-src/test/ui/simd/intrinsic/generic-cast-pass.rs
-src/test/ui/simd/intrinsic/generic-cast-pointer-width.rs
-src/test/ui/simd/intrinsic/generic-comparison-pass.rs
-src/test/ui/simd/intrinsic/generic-elements-pass.rs
-src/test/ui/simd/intrinsic/generic-reduction-pass.rs
-src/test/ui/simd/intrinsic/generic-select-pass.rs
-src/test/ui/simd/intrinsic/inlining-issue67557-ice.rs
-src/test/ui/simd/intrinsic/inlining-issue67557.rs
-src/test/ui/simd/monomorphize-shuffle-index.rs
-src/test/ui/simd/shuffle.rs
-src/test/ui/simd/simd-bitmask.rs
-src/test/ui/binding/fn-arg-incomplete-pattern-drop-order.rs
-src/test/ui/drop/dynamic-drop.rs
-src/test/ui/generator/resume-after-return.rs
-src/test/ui/iterators/iter-step-overflow-debug.rs
-src/test/ui/macros/rfc-2011-nicer-assert-messages/all-expr-kinds.rs
-src/test/ui/numbers-arithmetic/next-power-of-two-overflow-debug.rs
-src/test/ui/panic-while-printing.rs
-src/test/ui/privacy/reachable-unnameable-items.rs
-src/test/ui/rfc-1937-termination-trait/termination-trait-in-test.rs
-src/test/ui/async-await/async-fn-size-moved-locals.rs
-src/test/ui/async-await/async-fn-size-uninit-locals.rs
-src/test/ui/cfg/cfg-panic.rs
-src/test/ui/generator/size-moved-locals.rs
-src/test/ui/macros/rfc-2011-nicer-assert-messages/all-not-available-cases.rs
-src/test/ui/runtime/rt-explody-panic-payloads.rs
-src/test/ui/simd/intrinsic/generic-gather-pass.rs
-src/test/ui/simd/issue-85915-simd-ptrs.rs
+tests/ui/asm/x86_64/issue-96797.rs
+tests/ui/intrinsics/const-eval-select-x86_64.rs
+tests/ui/packed/packed-struct-drop-aligned.rs
+tests/ui/packed/packed-struct-generic-layout.rs
+tests/ui/packed/packed-struct-layout.rs
+tests/ui/packed/packed-struct-optimized-enum.rs
+tests/ui/packed/packed-struct-size.rs
+tests/ui/packed/packed-struct-vec.rs
+tests/ui/packed/packed-tuple-struct-layout.rs
+tests/ui/simd/array-type.rs
+tests/ui/simd/intrinsic/float-minmax-pass.rs
+tests/ui/simd/intrinsic/generic-arithmetic-saturating-pass.rs
+tests/ui/simd/intrinsic/generic-as.rs
+tests/ui/simd/intrinsic/generic-cast-pass.rs
+tests/ui/simd/intrinsic/generic-cast-pointer-width.rs
+tests/ui/simd/intrinsic/generic-comparison-pass.rs
+tests/ui/simd/intrinsic/generic-elements-pass.rs
+tests/ui/simd/intrinsic/generic-reduction-pass.rs
+tests/ui/simd/intrinsic/generic-select-pass.rs
+tests/ui/simd/intrinsic/inlining-issue67557-ice.rs
+tests/ui/simd/intrinsic/inlining-issue67557.rs
+tests/ui/simd/monomorphize-shuffle-index.rs
+tests/ui/simd/shuffle.rs
+tests/ui/simd/simd-bitmask.rs
+tests/ui/generator/resume-after-return.rs
+tests/ui/iterators/iter-step-overflow-debug.rs
+tests/ui/macros/rfc-2011-nicer-assert-messages/all-expr-kinds.rs
+tests/ui/numbers-arithmetic/next-power-of-two-overflow-debug.rs
+tests/ui/privacy/reachable-unnameable-items.rs
+tests/ui/rfc-1937-termination-trait/termination-trait-in-test.rs
+tests/ui/async-await/async-fn-size-moved-locals.rs
+tests/ui/async-await/async-fn-size-uninit-locals.rs
+tests/ui/cfg/cfg-panic.rs
+tests/ui/generator/size-moved-locals.rs
+tests/ui/macros/rfc-2011-nicer-assert-messages/all-not-available-cases.rs
+tests/ui/simd/intrinsic/generic-gather-pass.rs
+tests/ui/simd/issue-85915-simd-ptrs.rs
+tests/ui/issues/issue-68010-large-zst-consts.rs
+tests/ui/rust-2018/proc-macro-crate-in-paths.rs