Skip to content

Commit 92d5e64

Browse files
authored
Merge branch 'main' into memchrinvariant
2 parents 5ea263a + 2a203c5 commit 92d5e64

Some content is hidden

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

99 files changed

+4202
-1148
lines changed

doc/src/challenges/0005-linked-list.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# Challenge 5: Verify functions iterating over inductive data type: `linked_list`
22

3-
- **Status:** Open
3+
- **Status:** Resolved
44
- **Tracking Issue:** [#29](https://github.com/model-checking/verify-rust-std/issues/29)
55
- **Start date:** *2024/07/01*
6-
- **End date:** *2025/04/10*
6+
- **End date:** *2025/08/12*
77
- **Reward:** *5,000 USD*
8+
- **Contributors:** [Bart Jacobs](https://github.com/btj)
89

910
-------------------
1011

library/Cargo.lock

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

library/core/src/fmt/num.rs

Lines changed: 125 additions & 206 deletions
Large diffs are not rendered by default.

library/core/src/lib.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,13 @@ pub mod assert_matches {
228228
pub use crate::macros::{assert_matches, debug_assert_matches};
229229
}
230230

231+
#[unstable(feature = "derive_from", issue = "144889")]
232+
/// Unstable module containing the unstable `From` derive macro.
233+
pub mod from {
234+
#[unstable(feature = "derive_from", issue = "144889")]
235+
pub use crate::macros::builtin::From;
236+
}
237+
231238
// We don't export this through #[macro_export] for now, to avoid breakage.
232239
#[unstable(feature = "autodiff", issue = "124509")]
233240
/// Unstable module containing the unstable `autodiff` macro.

library/core/src/net/ip_addr.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -626,13 +626,13 @@ impl Ipv4Addr {
626626
/// # Examples
627627
///
628628
/// ```
629-
/// #![feature(ip_from)]
630629
/// use std::net::Ipv4Addr;
631630
///
632631
/// let addr = Ipv4Addr::from_octets([13u8, 12u8, 11u8, 10u8]);
633632
/// assert_eq!(Ipv4Addr::new(13, 12, 11, 10), addr);
634633
/// ```
635-
#[unstable(feature = "ip_from", issue = "131360")]
634+
#[stable(feature = "ip_from", since = "CURRENT_RUSTC_VERSION")]
635+
#[rustc_const_stable(feature = "ip_from", since = "CURRENT_RUSTC_VERSION")]
636636
#[must_use]
637637
#[inline]
638638
pub const fn from_octets(octets: [u8; 4]) -> Ipv4Addr {
@@ -1464,7 +1464,6 @@ impl Ipv6Addr {
14641464
/// # Examples
14651465
///
14661466
/// ```
1467-
/// #![feature(ip_from)]
14681467
/// use std::net::Ipv6Addr;
14691468
///
14701469
/// let addr = Ipv6Addr::from_segments([
@@ -1479,7 +1478,8 @@ impl Ipv6Addr {
14791478
/// addr
14801479
/// );
14811480
/// ```
1482-
#[unstable(feature = "ip_from", issue = "131360")]
1481+
#[stable(feature = "ip_from", since = "CURRENT_RUSTC_VERSION")]
1482+
#[rustc_const_stable(feature = "ip_from", since = "CURRENT_RUSTC_VERSION")]
14831483
#[must_use]
14841484
#[inline]
14851485
pub const fn from_segments(segments: [u16; 8]) -> Ipv6Addr {
@@ -2029,7 +2029,6 @@ impl Ipv6Addr {
20292029
/// # Examples
20302030
///
20312031
/// ```
2032-
/// #![feature(ip_from)]
20332032
/// use std::net::Ipv6Addr;
20342033
///
20352034
/// let addr = Ipv6Addr::from_octets([
@@ -2044,7 +2043,8 @@ impl Ipv6Addr {
20442043
/// addr
20452044
/// );
20462045
/// ```
2047-
#[unstable(feature = "ip_from", issue = "131360")]
2046+
#[stable(feature = "ip_from", since = "CURRENT_RUSTC_VERSION")]
2047+
#[rustc_const_stable(feature = "ip_from", since = "CURRENT_RUSTC_VERSION")]
20482048
#[must_use]
20492049
#[inline]
20502050
pub const fn from_octets(octets: [u8; 16]) -> Ipv6Addr {

library/core/src/num/dec2flt/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ macro_rules! from_str_float_impl {
124124
/// * '2.5E-10'
125125
/// * '5.'
126126
/// * '.5', or, equivalently, '0.5'
127+
/// * '7'
128+
/// * '007'
127129
/// * 'inf', '-inf', '+infinity', 'NaN'
128130
///
129131
/// Note that alphabetical characters are not case-sensitive.

library/core/src/num/int_macros.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2506,8 +2506,7 @@ macro_rules! int_impl {
25062506
///
25072507
/// # Examples
25082508
///
2509-
/// Please note that this example is shared between integer types.
2510-
/// Which explains why `i32` is used here.
2509+
/// Please note that this example is shared among integer types, which is why `i32` is used.
25112510
///
25122511
/// ```
25132512
/// #![feature(bigint_helper_methods)]
@@ -2537,8 +2536,7 @@ macro_rules! int_impl {
25372536
///
25382537
/// # Examples
25392538
///
2540-
/// Please note that this example is shared between integer types.
2541-
/// Which explains why `i32` is used here.
2539+
/// Please note that this example is shared among integer types, which is why `i32` is used.
25422540
///
25432541
/// ```
25442542
/// #![feature(bigint_helper_methods)]
@@ -2575,8 +2573,7 @@ macro_rules! int_impl {
25752573
///
25762574
/// # Examples
25772575
///
2578-
/// Please note that this example is shared between integer types.
2579-
/// Which explains why `i32` is used here.
2576+
/// Please note that this example is shared among integer types, which is why `i32` is used.
25802577
///
25812578
/// ```
25822579
/// #![feature(bigint_helper_methods)]

library/core/src/num/saturating.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -739,8 +739,8 @@ macro_rules! saturating_int_impl {
739739
///
740740
/// # Examples
741741
///
742-
/// Please note that this example is shared between integer types.
743-
/// Which explains why `i16` is used here.
742+
/// Please note that this example is shared among integer types, which is why `i16`
743+
/// is used.
744744
///
745745
/// ```
746746
/// use std::num::Saturating;

library/core/src/num/uint_macros.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2122,8 +2122,7 @@ macro_rules! uint_impl {
21222122
///
21232123
/// # Examples
21242124
///
2125-
/// Please note that this example is shared between integer types.
2126-
/// Which explains why `u8` is used here.
2125+
/// Please note that this example is shared among integer types, which is why `u8` is used.
21272126
///
21282127
/// ```
21292128
/// assert_eq!(10u8.wrapping_mul(12), 120);
@@ -2617,8 +2616,8 @@ macro_rules! uint_impl {
26172616
///
26182617
/// # Examples
26192618
///
2620-
/// Please note that this example is shared between integer types.
2621-
/// Which explains why `u32` is used here.
2619+
/// Please note that this example is shared among integer types, which is why why `u32`
2620+
/// is used.
26222621
///
26232622
/// ```
26242623
/// assert_eq!(5u32.overflowing_mul(2), (10, false));
@@ -2644,8 +2643,7 @@ macro_rules! uint_impl {
26442643
///
26452644
/// # Examples
26462645
///
2647-
/// Please note that this example is shared between integer types.
2648-
/// Which explains why `u32` is used here.
2646+
/// Please note that this example is shared among integer types, which is why `u32` is used.
26492647
///
26502648
/// ```
26512649
/// #![feature(bigint_helper_methods)]
@@ -2675,8 +2673,7 @@ macro_rules! uint_impl {
26752673
///
26762674
/// # Examples
26772675
///
2678-
/// Please note that this example is shared between integer types.
2679-
/// Which explains why `u32` is used here.
2676+
/// Please note that this example is shared among integer types, which is why `u32` is used.
26802677
///
26812678
/// ```
26822679
/// #![feature(bigint_helper_methods)]

library/core/src/num/wrapping.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -775,8 +775,8 @@ macro_rules! wrapping_int_impl {
775775
///
776776
/// # Examples
777777
///
778-
/// Please note that this example is shared between integer types.
779-
/// Which explains why `i16` is used here.
778+
/// Please note that this example is shared among integer types, which is why `i16`
779+
/// is used.
780780
///
781781
/// Basic usage:
782782
///

0 commit comments

Comments
 (0)