diff options
| author | Laurențiu Nicola <lnicola@dend.ro> | 2025-01-07 17:57:53 +0200 |
|---|---|---|
| committer | Laurențiu Nicola <lnicola@dend.ro> | 2025-01-07 17:57:53 +0200 |
| commit | e103ab16084dc735b8db6b90186cd7b6967402ee (patch) | |
| tree | f2f3317a4a2031c7cc1a141c5703166e6fa1d107 /tests/debuginfo | |
| parent | aa1ef0a432100170d07b89f487e18fc2673c40ba (diff) | |
| parent | fb546ee09b226bc4dd4b712d35a372d923c4fa54 (diff) | |
| download | rust-e103ab16084dc735b8db6b90186cd7b6967402ee.tar.gz rust-e103ab16084dc735b8db6b90186cd7b6967402ee.zip | |
Merge from rust-lang/rust
Diffstat (limited to 'tests/debuginfo')
| -rw-r--r-- | tests/debuginfo/function-names.rs | 2 | ||||
| -rw-r--r-- | tests/debuginfo/mutex.rs | 6 | ||||
| -rw-r--r-- | tests/debuginfo/rwlock-read.rs | 4 | ||||
| -rw-r--r-- | tests/debuginfo/rwlock-write.rs | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/tests/debuginfo/function-names.rs b/tests/debuginfo/function-names.rs index d9b61e73621..c51884451e5 100644 --- a/tests/debuginfo/function-names.rs +++ b/tests/debuginfo/function-names.rs @@ -37,7 +37,7 @@ // Const generic parameter // gdb-command:info functions -q function_names::const_generic_fn.* // gdb-check:[...]static fn function_names::const_generic_fn_bool<false>(); -// gdb-check:[...]static fn function_names::const_generic_fn_non_int<{CONST#a70c39591cb5f53d}>(); +// gdb-check:[...]static fn function_names::const_generic_fn_non_int<{CONST#ffa3db4ca1d52dce}>(); // gdb-check:[...]static fn function_names::const_generic_fn_signed_int<-7>(); // gdb-check:[...]static fn function_names::const_generic_fn_unsigned_int<14>(); diff --git a/tests/debuginfo/mutex.rs b/tests/debuginfo/mutex.rs index 4f458c0d7e0..c47e3ac6dce 100644 --- a/tests/debuginfo/mutex.rs +++ b/tests/debuginfo/mutex.rs @@ -9,7 +9,7 @@ // cdb-command:g // // cdb-command:dx m,d -// cdb-check:m,d [Type: std::sync::mutex::Mutex<i32>] +// cdb-check:m,d [Type: std::sync::poison::mutex::Mutex<i32>] // cdb-check: [...] inner [Type: std::sys::sync::mutex::futex::Mutex] // cdb-check: [...] poison [Type: std::sync::poison::Flag] // cdb-check: [...] data : 0 [Type: core::cell::UnsafeCell<i32>] @@ -21,8 +21,8 @@ // // cdb-command:dx _lock,d -// cdb-check:_lock,d : Ok [Type: enum2$<core::result::Result<std::sync::mutex::MutexGuard<i32>,enum2$<std::sync::poison::TryLockError<std::sync::mutex::MutexGuard<i32> > > > >] -// cdb-check: [...] __0 [Type: std::sync::mutex::MutexGuard<i32>] +// cdb-check:_lock,d : Ok [Type: enum2$<core::result::Result<std::sync::poison::mutex::MutexGuard<i32>,enum2$<std::sync::poison::TryLockError<std::sync::poison::mutex::MutexGuard<i32> > > > >] +// cdb-check: [...] __0 [Type: std::sync::poison::mutex::MutexGuard<i32>] use std::sync::Mutex; diff --git a/tests/debuginfo/rwlock-read.rs b/tests/debuginfo/rwlock-read.rs index 3fd6ac33726..825cdbe5510 100644 --- a/tests/debuginfo/rwlock-read.rs +++ b/tests/debuginfo/rwlock-read.rs @@ -9,12 +9,12 @@ // cdb-command:g // // cdb-command:dx l -// cdb-check:l [Type: std::sync::rwlock::RwLock<i32>] +// cdb-check:l [Type: std::sync::poison::rwlock::RwLock<i32>] // cdb-check: [...] poison [Type: std::sync::poison::Flag] // cdb-check: [...] data : 0 [Type: core::cell::UnsafeCell<i32>] // // cdb-command:dx r -// cdb-check:r [Type: std::sync::rwlock::RwLockReadGuard<i32>] +// cdb-check:r [Type: std::sync::poison::rwlock::RwLockReadGuard<i32>] // cdb-check: [...] data : NonNull([...]: 0) [Type: core::ptr::non_null::NonNull<i32>] // cdb-check: [...] inner_lock : [...] [Type: std::sys::sync::rwlock::futex::RwLock *] diff --git a/tests/debuginfo/rwlock-write.rs b/tests/debuginfo/rwlock-write.rs index d7864303666..aaca048b8a7 100644 --- a/tests/debuginfo/rwlock-write.rs +++ b/tests/debuginfo/rwlock-write.rs @@ -9,8 +9,8 @@ // cdb-command:g // // cdb-command:dx w -// cdb-check:w [Type: std::sync::rwlock::RwLockWriteGuard<i32>] -// cdb-check: [...] lock : [...] [Type: std::sync::rwlock::RwLock<i32> *] +// cdb-check:w [Type: std::sync::poison::rwlock::RwLockWriteGuard<i32>] +// cdb-check: [...] lock : [...] [Type: std::sync::poison::rwlock::RwLock<i32> *] // cdb-check: [...] poison [Type: std::sync::poison::Guard] #[allow(unused_variables)] |