fixup failing test, bless error changes

rust-lang · Jul 31, 2024 · 06d03a0 · 06d03a0
1 parent 86e8ede
commit 06d03a0
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 39 deletions.
diff --git a/tests/mir-opt/pre-codegen/vec_deref.vec_deref_to_slice.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/vec_deref.vec_deref_to_slice.PreCodegen.after.panic-unwind.mir
@@ -5,41 +5,44 @@ fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
     let mut _0: &[u8];
     scope 1 (inlined <Vec<u8> as Deref>::deref) {
         debug self => _1;
-        let mut _4: *const u8;
-        let mut _5: usize;
-        scope 2 (inlined Vec::<u8>::as_ptr) {
+        scope 2 (inlined Vec::<u8>::as_slice) {
             debug self => _1;
-            let mut _2: &alloc::raw_vec::RawVec<u8>;
-            scope 3 (inlined alloc::raw_vec::RawVec::<u8>::ptr) {
-                debug self => _2;
-                let mut _3: std::ptr::NonNull<u8>;
-                scope 4 (inlined Unique::<u8>::as_ptr) {
-                    debug ((self: Unique<u8>).0: std::ptr::NonNull<u8>) => _3;
-                    debug ((self: Unique<u8>).1: std::marker::PhantomData<u8>) => const PhantomData::<u8>;
-                    scope 5 (inlined NonNull::<u8>::as_ptr) {
-                        debug self => _3;
+            let mut _4: *const u8;
+            let mut _5: usize;
+            scope 3 (inlined Vec::<u8>::as_ptr) {
+                debug self => _1;
+                let mut _2: &alloc::raw_vec::RawVec<u8>;
+                scope 4 (inlined alloc::raw_vec::RawVec::<u8>::ptr) {
+                    debug self => _2;
+                    let mut _3: std::ptr::NonNull<u8>;
+                    scope 5 (inlined Unique::<u8>::as_ptr) {
+                        debug ((self: Unique<u8>).0: std::ptr::NonNull<u8>) => _3;
+                        debug ((self: Unique<u8>).1: std::marker::PhantomData<u8>) => const PhantomData::<u8>;
+                        scope 6 (inlined NonNull::<u8>::as_ptr) {
+                            debug self => _3;
+                        }
                     }
                 }
             }
-        }
-        scope 6 (inlined std::slice::from_raw_parts::<'_, u8>) {
-            debug data => _4;
-            debug len => _5;
-            let _6: *const [u8];
-            scope 7 (inlined core::ub_checks::check_language_ub) {
-                scope 8 (inlined core::ub_checks::check_language_ub::runtime) {
-                }
-            }
-            scope 9 (inlined std::mem::size_of::<u8>) {
-            }
-            scope 10 (inlined align_of::<u8>) {
-            }
-            scope 11 (inlined slice_from_raw_parts::<u8>) {
+            scope 7 (inlined std::slice::from_raw_parts::<'_, u8>) {
                 debug data => _4;
                 debug len => _5;
-                scope 12 (inlined std::ptr::from_raw_parts::<[u8], u8>) {
-                    debug data_pointer => _4;
-                    debug metadata => _5;
+                let _6: *const [u8];
+                scope 8 (inlined core::ub_checks::check_language_ub) {
+                    scope 9 (inlined core::ub_checks::check_language_ub::runtime) {
+                    }
+                }
+                scope 10 (inlined std::mem::size_of::<u8>) {
+                }
+                scope 11 (inlined align_of::<u8>) {
+                }
+                scope 12 (inlined slice_from_raw_parts::<u8>) {
+                    debug data => _4;
+                    debug len => _5;
+                    scope 13 (inlined std::ptr::from_raw_parts::<[u8], u8>) {
+                        debug data_pointer => _4;
+                        debug metadata => _5;
+                    }
                 }
             }
         }

diff --git a/tests/ui/consts/issue-94675.rs b/tests/ui/consts/issue-94675.rs
@@ -1,6 +1,6 @@
 //@ known-bug: #103507
 
-#![feature(const_trait_impl, const_mut_refs)]
+#![feature(const_trait_impl, const_mut_refs, const_vec_string_slice)]
 
 struct Foo<'a> {
     bar: &'a mut Vec<usize>,

diff --git a/tests/ui/consts/issue-94675.stderr b/tests/ui/consts/issue-94675.stderr
@@ -1,11 +1,3 @@
-error[E0015]: cannot call non-const fn `Vec::<u32>::len` in constant functions
-  --> $DIR/issue-94675.rs:11:27
-   |
-LL |         self.bar[0] = baz.len();
-   |                           ^^^^^
-   |
-   = note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
-
 error[E0015]: cannot call non-const operator in constant functions
   --> $DIR/issue-94675.rs:11:17
    |
@@ -20,6 +12,6 @@ help: add `#![feature(effects)]` to the crate attributes to enable
 LL + #![feature(effects)]
    |
 
-error: aborting due to 2 previous errors
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0015`.