From 809a1a86e04d03619642ab9074b9c95a24cbf82b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= <matthias.krueger@famsik.de>
Date: Mon, 24 Dec 2018 21:43:51 +0100
Subject: [PATCH 1/6] mark str::string::String.trim.* functions as #[must_use].
The functions return a reference to a new object and do not modify in-place
as the following code shows:
````
let s = String::from(" hello ");
s.trim();
assert_eq!(s, " hello ");
````
The new reference should be bound to a variable as now indicated by #[must_use].
---
src/libcore/str/mod.rs | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs
index 689d456d41246..a8b8b44413e13 100644
--- a/src/libcore/str/mod.rs
+++ b/src/libcore/str/mod.rs
@@ -3544,6 +3544,8 @@ impl str {
///
/// assert_eq!("Hello\tworld", s.trim());
/// ```
+ #[must_use = "this returns the trimmed string as a new allocation, \
+ without modifying the original"]
#[stable(feature = "rust1", since = "1.0.0")]
pub fn trim(&self) -> &str {
self.trim_matches(|c: char| c.is_whitespace())
@@ -3579,6 +3581,8 @@ impl str {
/// let s = " עברית ";
/// assert!(Some('ע') == s.trim_start().chars().next());
/// ```
+ #[must_use = "this returns the trimmed string as a new allocation, \
+ without modifying the original"]
#[stable(feature = "trim_direction", since = "1.30.0")]
pub fn trim_start(&self) -> &str {
self.trim_start_matches(|c: char| c.is_whitespace())
@@ -3614,6 +3618,8 @@ impl str {
/// let s = " עברית ";
/// assert!(Some('ת') == s.trim_end().chars().rev().next());
/// ```
+ #[must_use = "this returns the trimmed string as a new allocation, \
+ without modifying the original"]
#[stable(feature = "trim_direction", since = "1.30.0")]
pub fn trim_end(&self) -> &str {
self.trim_end_matches(|c: char| c.is_whitespace())
@@ -3716,6 +3722,8 @@ impl str {
/// ```
/// assert_eq!("1foo1barXX".trim_matches(|c| c == '1' || c == 'X'), "foo1bar");
/// ```
+ #[must_use = "this returns the trimmed string as a new allocation, \
+ without modifying the original"]
#[stable(feature = "rust1", since = "1.0.0")]
pub fn trim_matches<'a, P: Pattern<'a>>(&'a self, pat: P) -> &'a str
where P::Searcher: DoubleEndedSearcher<'a>
@@ -3761,6 +3769,8 @@ impl str {
/// let x: &[_] = &['1', '2'];
/// assert_eq!("12foo1bar12".trim_start_matches(x), "foo1bar12");
/// ```
+ #[must_use = "this returns the trimmed string as a new allocation, \
+ without modifying the original"]
#[stable(feature = "trim_direction", since = "1.30.0")]
pub fn trim_start_matches<'a, P: Pattern<'a>>(&'a self, pat: P) -> &'a str {
let mut i = self.len();
@@ -3804,6 +3814,8 @@ impl str {
/// ```
/// assert_eq!("1fooX".trim_end_matches(|c| c == '1' || c == 'X'), "1foo");
/// ```
+ #[must_use = "this returns the trimmed string as a new allocation, \
+ without modifying the original"]
#[stable(feature = "trim_direction", since = "1.30.0")]
pub fn trim_end_matches<'a, P: Pattern<'a>>(&'a self, pat: P) -> &'a str
where P::Searcher: ReverseSearcher<'a>
From e7ce868f8e7ba2df728451bcbeafe387d393a1bc Mon Sep 17 00:00:00 2001
From: "Zack M. Davis" <main@zackmdavis.net>
Date: Tue, 25 Dec 2018 20:28:20 +0100
Subject: [PATCH 2/6] Update src/libcore/str/mod.rs, tweak must_use message
trimmed string is returned as a slice instead of a new allocation
Co-Authored-By: matthiaskrgr <matthias.krueger@famsik.de>
---
src/libcore/str/mod.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs
index a8b8b44413e13..9e724f117ff6e 100644
--- a/src/libcore/str/mod.rs
+++ b/src/libcore/str/mod.rs
@@ -3544,7 +3544,7 @@ impl str {
///
/// assert_eq!("Hello\tworld", s.trim());
/// ```
- #[must_use = "this returns the trimmed string as a new allocation, \
+ #[must_use = "this returns the trimmed string as a slice, \
without modifying the original"]
#[stable(feature = "rust1", since = "1.0.0")]
pub fn trim(&self) -> &str {
From 74e9057905c3c24303245a4a2c5671d80a9503b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= <matthias.krueger@famsik.de>
Date: Wed, 26 Dec 2018 22:03:04 +0100
Subject: [PATCH 3/6] modify remaining #[must_use[ messages
---
src/libcore/str/mod.rs | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs
index 9e724f117ff6e..e58320ebf569e 100644
--- a/src/libcore/str/mod.rs
+++ b/src/libcore/str/mod.rs
@@ -3581,7 +3581,7 @@ impl str {
/// let s = " עברית ";
/// assert!(Some('ע') == s.trim_start().chars().next());
/// ```
- #[must_use = "this returns the trimmed string as a new allocation, \
+ #[must_use = "this returns the trimmed string as a new slice, \
without modifying the original"]
#[stable(feature = "trim_direction", since = "1.30.0")]
pub fn trim_start(&self) -> &str {
@@ -3618,7 +3618,7 @@ impl str {
/// let s = " עברית ";
/// assert!(Some('ת') == s.trim_end().chars().rev().next());
/// ```
- #[must_use = "this returns the trimmed string as a new allocation, \
+ #[must_use = "this returns the trimmed string as a new slice, \
without modifying the original"]
#[stable(feature = "trim_direction", since = "1.30.0")]
pub fn trim_end(&self) -> &str {
@@ -3722,7 +3722,7 @@ impl str {
/// ```
/// assert_eq!("1foo1barXX".trim_matches(|c| c == '1' || c == 'X'), "foo1bar");
/// ```
- #[must_use = "this returns the trimmed string as a new allocation, \
+ #[must_use = "this returns the trimmed string as a new slice, \
without modifying the original"]
#[stable(feature = "rust1", since = "1.0.0")]
pub fn trim_matches<'a, P: Pattern<'a>>(&'a self, pat: P) -> &'a str
@@ -3769,7 +3769,7 @@ impl str {
/// let x: &[_] = &['1', '2'];
/// assert_eq!("12foo1bar12".trim_start_matches(x), "foo1bar12");
/// ```
- #[must_use = "this returns the trimmed string as a new allocation, \
+ #[must_use = "this returns the trimmed string as a new slice, \
without modifying the original"]
#[stable(feature = "trim_direction", since = "1.30.0")]
pub fn trim_start_matches<'a, P: Pattern<'a>>(&'a self, pat: P) -> &'a str {
@@ -3814,7 +3814,7 @@ impl str {
/// ```
/// assert_eq!("1fooX".trim_end_matches(|c| c == '1' || c == 'X'), "1foo");
/// ```
- #[must_use = "this returns the trimmed string as a new allocation, \
+ #[must_use = "this returns the trimmed string as a new slice, \
without modifying the original"]
#[stable(feature = "trim_direction", since = "1.30.0")]
pub fn trim_end_matches<'a, P: Pattern<'a>>(&'a self, pat: P) -> &'a str
From 8db66ca53e9521f5ff52541e5793652688c3c367 Mon Sep 17 00:00:00 2001
From: Andy Russell <arussell123@gmail.com>
Date: Sat, 26 Jan 2019 12:54:09 -0500
Subject: [PATCH 4/6] use `SOURCE_DATE_EPOCH` for man page time if set
---
src/bootstrap/dist.rs | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 98d2fb1e2d039..c41df3209c8ff 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -23,7 +23,7 @@ use crate::builder::{Builder, RunConfig, ShouldRun, Step};
use crate::compile;
use crate::tool::{self, Tool};
use crate::cache::{INTERNER, Interned};
-use time;
+use time::{self, Timespec};
pub fn pkgname(builder: &Builder, component: &str) -> String {
if component == "cargo" {
@@ -528,7 +528,19 @@ impl Step for Rustc {
t!(fs::create_dir_all(image.join("share/man/man1")));
let man_src = builder.src.join("src/doc/man");
let man_dst = image.join("share/man/man1");
- let month_year = t!(time::strftime("%B %Y", &time::now()));
+
+ // Reproducible builds: If SOURCE_DATE_EPOCH is set, use that as the time.
+ let time = env::var("SOURCE_DATE_EPOCH")
+ .map(|timestamp| {
+ let epoch = timestamp.parse().map_err(|err| {
+ format!("could not parse SOURCE_DATE_EPOCH: {}", err)
+ }).unwrap();
+
+ time::at(Timespec::new(epoch, 0))
+ })
+ .unwrap_or_else(|_| time::now());
+
+ let month_year = t!(time::strftime("%B %Y", &time));
// don't use our `bootstrap::util::{copy, cp_r}`, because those try
// to hardlink, and we don't want to edit the source templates
for file_entry in builder.read_dir(&man_src) {
From 1e577269da046b5e2b862830b72210c855fca123 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Sun, 27 Jan 2019 17:03:03 +0000
Subject: [PATCH 5/6] Introduce into_raw_non_null on Rc and Arc
---
src/liballoc/rc.rs | 21 +++++++++++++++++++++
src/liballoc/sync.rs | 21 +++++++++++++++++++++
2 files changed, 42 insertions(+)
diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs
index d3a55c59ff69c..456f7cd5e2ff1 100644
--- a/src/liballoc/rc.rs
+++ b/src/liballoc/rc.rs
@@ -435,6 +435,27 @@ impl<T: ?Sized> Rc<T> {
}
}
+ /// Consumes the `Rc`, returning the wrapped pointer as `NonNull<T>`.
+ ///
+ /// # Examples
+ ///
+ /// ```
+ /// #![feature(rc_into_raw_non_null)]
+ ///
+ /// use std::rc::Rc;
+ ///
+ /// let x = Rc::new(10);
+ /// let ptr = Rc::into_raw_non_null(x);
+ /// let deref = unsafe { *ptr.as_ref() };
+ /// assert_eq!(deref, 10);
+ /// ```
+ #[unstable(feature = "rc_into_raw_non_null", issue = "47336")]
+ #[inline]
+ pub fn into_raw_non_null(this: Self) -> NonNull<T> {
+ // safe because Rc guarantees its pointer is non-null
+ unsafe { NonNull::new_unchecked(Rc::into_raw(this) as *mut _) }
+ }
+
/// Creates a new [`Weak`][weak] pointer to this value.
///
/// [weak]: struct.Weak.html
diff --git a/src/liballoc/sync.rs b/src/liballoc/sync.rs
index 390a079165054..5cffa93db11d4 100644
--- a/src/liballoc/sync.rs
+++ b/src/liballoc/sync.rs
@@ -413,6 +413,27 @@ impl<T: ?Sized> Arc<T> {
}
}
+ /// Consumes the `Arc`, returning the wrapped pointer as `NonNull<T>`.
+ ///
+ /// # Examples
+ ///
+ /// ```
+ /// #![feature(rc_into_raw_non_null)]
+ ///
+ /// use std::sync::Arc;
+ ///
+ /// let x = Arc::new(10);
+ /// let ptr = Arc::into_raw_non_null(x);
+ /// let deref = unsafe { *ptr.as_ref() };
+ /// assert_eq!(deref, 10);
+ /// ```
+ #[unstable(feature = "rc_into_raw_non_null", issue = "47336")]
+ #[inline]
+ pub fn into_raw_non_null(this: Self) -> NonNull<T> {
+ // safe because Arc guarantees its pointer is non-null
+ unsafe { NonNull::new_unchecked(Arc::into_raw(this) as *mut _) }
+ }
+
/// Creates a new [`Weak`][weak] pointer to this value.
///
/// [weak]: struct.Weak.html
From 7e22cb27563810596fdd55748dba0e1d0daa77be Mon Sep 17 00:00:00 2001
From: Andre Bogus <bogusandre@gmail.com>
Date: Tue, 29 Jan 2019 16:15:02 +0100
Subject: [PATCH 6/6] override `VecDeque`'s `Iter::try_fold`
---
src/liballoc/collections/vec_deque.rs | 10 ++++++-
src/liballoc/lib.rs | 1 +
src/liballoc/tests/vec_deque.rs | 38 +++++++++++++++++++++++++++
3 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/src/liballoc/collections/vec_deque.rs b/src/liballoc/collections/vec_deque.rs
index b3f7ef5fd6ecc..579d7de96e6da 100644
--- a/src/liballoc/collections/vec_deque.rs
+++ b/src/liballoc/collections/vec_deque.rs
@@ -12,7 +12,7 @@ use core::fmt;
use core::iter::{repeat_with, FromIterator, FusedIterator};
use core::mem;
use core::ops::Bound::{Excluded, Included, Unbounded};
-use core::ops::{Index, IndexMut, RangeBounds};
+use core::ops::{Index, IndexMut, RangeBounds, Try};
use core::ptr;
use core::ptr::NonNull;
use core::slice;
@@ -2172,6 +2172,14 @@ impl<'a, T> Iterator for Iter<'a, T> {
accum = front.iter().fold(accum, &mut f);
back.iter().fold(accum, &mut f)
}
+
+ fn try_fold<B, F, R>(&mut self, init: B, mut f: F) -> R where
+ Self: Sized, F: FnMut(B, Self::Item) -> R, R: Try<Ok=B>
+ {
+ let (front, back) = RingSlices::ring_slices(self.ring, self.head, self.tail);
+ let accum = front.iter().try_fold(init, &mut f)?;
+ back.iter().try_fold(accum, &mut f)
+ }
}
#[stable(feature = "rust1", since = "1.0.0")]
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
index d2ff1bae63561..5165a7ca5a8f3 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -113,6 +113,7 @@
#![feature(slice_partition_dedup)]
#![feature(maybe_uninit)]
#![feature(alloc_layout_extra)]
+#![feature(try_trait)]
// Allow testing this library
diff --git a/src/liballoc/tests/vec_deque.rs b/src/liballoc/tests/vec_deque.rs
index 76831ba65e3b8..e2896cffea092 100644
--- a/src/liballoc/tests/vec_deque.rs
+++ b/src/liballoc/tests/vec_deque.rs
@@ -1433,3 +1433,41 @@ fn test_rotate_right_random() {
}
}
}
+
+#[test]
+fn test_try_fold_empty() {
+ assert_eq!(Some(0), VecDeque::<u32>::new().iter().try_fold(0, |_, _| None));
+}
+
+#[test]
+fn test_try_fold_none() {
+ let v: VecDeque<u32> = (0..12).collect();
+ assert_eq!(None, v.into_iter().try_fold(0, |a, b|
+ if b < 11 { Some(a + b) } else { None }));
+}
+
+#[test]
+fn test_try_fold_ok() {
+ let v: VecDeque<u32> = (0..12).collect();
+ assert_eq!(Ok::<_, ()>(66), v.into_iter().try_fold(0, |a, b| Ok(a + b)));
+}
+
+#[test]
+fn test_try_fold_unit() {
+ let v: VecDeque<()> = std::iter::repeat(()).take(42).collect();
+ assert_eq!(Some(()), v.into_iter().try_fold((), |(), ()| Some(())));
+}
+
+#[test]
+fn test_try_fold_rotated() {
+ let mut v: VecDeque<_> = (0..12).collect();
+ for n in 0..30 {
+ if n & 1 == 0 {
+ let r = v[n];
+ v.rotate_left(n ^ r);
+ } else {
+ v.rotate_right(n % 11);
+ }
+ assert_eq!(Ok::<_, ()>(66), v.into_iter().try_fold(0, |a, b| Ok(a + b)));
+ }
+}