Skip to content

Commit 1c5f90f

Browse files
committed
Auto merge of #148985 - Zalathar:rollup-cjyuusw, r=Zalathar
Rollup of 10 pull requests Successful merges: - #148416 (`vec_recycle`: implementation) - #148522 (Micro-optimize rustdoc search index parsing) - #148827 (Stabilize vec_into_raw_parts) - #148832 (Bump library dependencies) - #148836 (tweak primitive reference docs) - #148859 (Fix overflow-checks test for RISC-V target) - #148886 (Add riscv64a23-unknown-linux-gnu to build-manifest TARGETS) - #148956 (re-enable wasm abi test) - #148963 (runtest.rs: remove redundant check) - #148968 (Add another *ExprWithBlock* test for `try` blocks) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 54f4176 + d270db6 commit 1c5f90f

File tree

15 files changed

+200
-136
lines changed

15 files changed

+200
-136
lines changed

library/Cargo.lock

Lines changed: 40 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ version = 4
44

55
[[package]]
66
name = "addr2line"
7-
version = "0.25.0"
7+
version = "0.25.1"
88
source = "registry+https://github.com/rust-lang/crates.io-index"
9-
checksum = "9acbfca36652500c911ddb767ed433e3ed99b032b5d935be73c6923662db1d43"
9+
checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b"
1010
dependencies = [
1111
"gimli",
1212
"rustc-std-workspace-alloc",
@@ -49,9 +49,9 @@ dependencies = [
4949

5050
[[package]]
5151
name = "cfg-if"
52-
version = "1.0.1"
52+
version = "1.0.4"
5353
source = "registry+https://github.com/rust-lang/crates.io-index"
54-
checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
54+
checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
5555
dependencies = [
5656
"rustc-std-workspace-core",
5757
]
@@ -78,9 +78,9 @@ dependencies = [
7878

7979
[[package]]
8080
name = "dlmalloc"
81-
version = "0.2.10"
81+
version = "0.2.11"
8282
source = "registry+https://github.com/rust-lang/crates.io-index"
83-
checksum = "fa3a2dbee57b69fbb5dbe852fa9c0925697fb0c7fbcb1593e90e5ffaedf13d51"
83+
checksum = "06cdfe340b16dd990c54cce79743613fa09fbb16774f33a77c9fd196f8f3fa30"
8484
dependencies = [
8585
"cfg-if",
8686
"libc",
@@ -109,9 +109,9 @@ dependencies = [
109109

110110
[[package]]
111111
name = "gimli"
112-
version = "0.32.0"
112+
version = "0.32.3"
113113
source = "registry+https://github.com/rust-lang/crates.io-index"
114-
checksum = "93563d740bc9ef04104f9ed6f86f1e3275c2cdafb95664e26584b9ca807a8ffe"
114+
checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
115115
dependencies = [
116116
"rustc-std-workspace-alloc",
117117
"rustc-std-workspace-core",
@@ -393,9 +393,9 @@ dependencies = [
393393

394394
[[package]]
395395
name = "vex-sdk"
396-
version = "0.27.0"
396+
version = "0.27.1"
397397
source = "registry+https://github.com/rust-lang/crates.io-index"
398-
checksum = "89f74fce61d7a7ba1589da9634c6305a72befb7cc9150c1f872d87d8060f32b9"
398+
checksum = "79e5fe15afde1305478b35e2cb717fff59f485428534cf49cfdbfa4723379bf6"
399399
dependencies = [
400400
"rustc-std-workspace-core",
401401
]
@@ -421,13 +421,19 @@ dependencies = [
421421
"wit-bindgen",
422422
]
423423

424+
[[package]]
425+
name = "windows-link"
426+
version = "0.2.1"
427+
source = "registry+https://github.com/rust-lang/crates.io-index"
428+
checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
429+
424430
[[package]]
425431
name = "windows-sys"
426-
version = "0.59.0"
432+
version = "0.60.2"
427433
source = "registry+https://github.com/rust-lang/crates.io-index"
428-
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
434+
checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
429435
dependencies = [
430-
"windows-targets 0.52.6",
436+
"windows-targets 0.53.5",
431437
]
432438

433439
[[package]]
@@ -436,10 +442,11 @@ version = "0.0.0"
436442

437443
[[package]]
438444
name = "windows-targets"
439-
version = "0.52.6"
445+
version = "0.53.5"
440446
source = "registry+https://github.com/rust-lang/crates.io-index"
441-
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
447+
checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
442448
dependencies = [
449+
"windows-link",
443450
"windows_aarch64_gnullvm",
444451
"windows_aarch64_msvc",
445452
"windows_i686_gnu",
@@ -452,57 +459,57 @@ dependencies = [
452459

453460
[[package]]
454461
name = "windows_aarch64_gnullvm"
455-
version = "0.52.6"
462+
version = "0.53.1"
456463
source = "registry+https://github.com/rust-lang/crates.io-index"
457-
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
464+
checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
458465

459466
[[package]]
460467
name = "windows_aarch64_msvc"
461-
version = "0.52.6"
468+
version = "0.53.1"
462469
source = "registry+https://github.com/rust-lang/crates.io-index"
463-
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
470+
checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
464471

465472
[[package]]
466473
name = "windows_i686_gnu"
467-
version = "0.52.6"
474+
version = "0.53.1"
468475
source = "registry+https://github.com/rust-lang/crates.io-index"
469-
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
476+
checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
470477

471478
[[package]]
472479
name = "windows_i686_gnullvm"
473-
version = "0.52.6"
480+
version = "0.53.1"
474481
source = "registry+https://github.com/rust-lang/crates.io-index"
475-
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
482+
checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
476483

477484
[[package]]
478485
name = "windows_i686_msvc"
479-
version = "0.52.6"
486+
version = "0.53.1"
480487
source = "registry+https://github.com/rust-lang/crates.io-index"
481-
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
488+
checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
482489

483490
[[package]]
484491
name = "windows_x86_64_gnu"
485-
version = "0.52.6"
492+
version = "0.53.1"
486493
source = "registry+https://github.com/rust-lang/crates.io-index"
487-
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
494+
checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
488495

489496
[[package]]
490497
name = "windows_x86_64_gnullvm"
491-
version = "0.52.6"
498+
version = "0.53.1"
492499
source = "registry+https://github.com/rust-lang/crates.io-index"
493-
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
500+
checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
494501

495502
[[package]]
496503
name = "windows_x86_64_msvc"
497-
version = "0.52.6"
504+
version = "0.53.1"
498505
source = "registry+https://github.com/rust-lang/crates.io-index"
499-
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
506+
checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
500507

501508
[[package]]
502509
name = "wit-bindgen"
503-
version = "0.45.0"
510+
version = "0.45.1"
504511
source = "registry+https://github.com/rust-lang/crates.io-index"
505-
checksum = "052283831dbae3d879dc7f51f3d92703a316ca49f91540417d38591826127814"
512+
checksum = "5c573471f125075647d03df72e026074b7203790d41351cd6edc96f46bcccd36"
506513
dependencies = [
507514
"rustc-std-workspace-alloc",
508515
"rustc-std-workspace-core",

library/alloc/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
#![feature(std_internals)]
148148
#![feature(str_internals)]
149149
#![feature(temporary_niche_types)]
150+
#![feature(transmutability)]
150151
#![feature(trivial_clone)]
151152
#![feature(trusted_fused)]
152153
#![feature(trusted_len)]

library/alloc/src/string.rs

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -265,18 +265,11 @@ use crate::vec::{self, Vec};
265265
/// You can look at these with the [`as_ptr`], [`len`], and [`capacity`]
266266
/// methods:
267267
///
268-
// FIXME Update this when vec_into_raw_parts is stabilized
269268
/// ```
270-
/// use std::mem;
271-
///
272269
/// let story = String::from("Once upon a time...");
273270
///
274-
/// // Prevent automatically dropping the String's data
275-
/// let mut story = mem::ManuallyDrop::new(story);
276-
///
277-
/// let ptr = story.as_mut_ptr();
278-
/// let len = story.len();
279-
/// let capacity = story.capacity();
271+
/// // Deconstruct the String into parts.
272+
/// let (ptr, len, capacity) = story.into_raw_parts();
280273
///
281274
/// // story has nineteen bytes
282275
/// assert_eq!(19, len);
@@ -932,7 +925,6 @@ impl String {
932925
/// # Examples
933926
///
934927
/// ```
935-
/// #![feature(vec_into_raw_parts)]
936928
/// let s = String::from("hello");
937929
///
938930
/// let (ptr, len, cap) = s.into_raw_parts();
@@ -941,7 +933,7 @@ impl String {
941933
/// assert_eq!(rebuilt, "hello");
942934
/// ```
943935
#[must_use = "losing the pointer will leak memory"]
944-
#[unstable(feature = "vec_into_raw_parts", reason = "new API", issue = "65816")]
936+
#[stable(feature = "vec_into_raw_parts", since = "CURRENT_RUSTC_VERSION")]
945937
pub fn into_raw_parts(self) -> (*mut u8, usize, usize) {
946938
self.vec.into_raw_parts()
947939
}
@@ -970,19 +962,12 @@ impl String {
970962
///
971963
/// # Examples
972964
///
973-
// FIXME Update this when vec_into_raw_parts is stabilized
974965
/// ```
975-
/// use std::mem;
976-
///
977966
/// unsafe {
978967
/// let s = String::from("hello");
979968
///
980-
/// // Prevent automatically dropping the String's data
981-
/// let mut s = mem::ManuallyDrop::new(s);
982-
///
983-
/// let ptr = s.as_mut_ptr();
984-
/// let len = s.len();
985-
/// let capacity = s.capacity();
969+
/// // Deconstruct the String into parts.
970+
/// let (ptr, len, capacity) = s.into_raw_parts();
986971
///
987972
/// let s = String::from_raw_parts(ptr, len, capacity);
988973
///

0 commit comments

Comments
 (0)