From 19645ac05a3e5cd4e508e9819f4939fc2f959b5b Mon Sep 17 00:00:00 2001
From: ltdk <usr@ltdk.xyz>
Date: Tue, 28 Dec 2021 20:59:50 -0500
Subject: [PATCH 1/5] Add Result::{ok, err, and, or, unwrap_or} as const
---
library/core/src/result.rs | 55 +++++++++++++++++++++++++++++++-------
1 file changed, 45 insertions(+), 10 deletions(-)
diff --git a/library/core/src/result.rs b/library/core/src/result.rs
index fbd6d419236ae..65812b2e0c375 100644
--- a/library/core/src/result.rs
+++ b/library/core/src/result.rs
@@ -632,10 +632,16 @@ impl<T, E> Result<T, E> {
/// ```
#[inline]
#[stable(feature = "rust1", since = "1.0.0")]
- pub fn ok(self) -> Option<T> {
+ #[rustc_const_unstable(feature = "const_result_drop", issue = "92384")]
+ pub const fn ok(self) -> Option<T>
+ where
+ E: ~const Drop,
+ {
match self {
Ok(x) => Some(x),
- Err(_) => None,
+ // FIXME: ~const Drop doesn't quite work right yet
+ #[allow(unused_variables)]
+ Err(x) => None,
}
}
@@ -657,9 +663,15 @@ impl<T, E> Result<T, E> {
/// ```
#[inline]
#[stable(feature = "rust1", since = "1.0.0")]
- pub fn err(self) -> Option<E> {
+ #[rustc_const_unstable(feature = "const_result_drop", issue = "92384")]
+ pub const fn err(self) -> Option<E>
+ where
+ T: ~const Drop,
+ {
match self {
- Ok(_) => None,
+ // FIXME: ~const Drop doesn't quite work right yet
+ #[allow(unused_variables)]
+ Ok(x) => None,
Err(x) => Some(x),
}
}
@@ -1266,10 +1278,18 @@ impl<T, E> Result<T, E> {
/// assert_eq!(x.and(y), Ok("different result type"));
/// ```
#[inline]
+ #[rustc_const_unstable(feature = "const_result_drop", issue = "92384")]
#[stable(feature = "rust1", since = "1.0.0")]
- pub fn and<U>(self, res: Result<U, E>) -> Result<U, E> {
+ pub const fn and<U>(self, res: Result<U, E>) -> Result<U, E>
+ where
+ T: ~const Drop,
+ U: ~const Drop,
+ E: ~const Drop,
+ {
match self {
- Ok(_) => res,
+ // FIXME: ~const Drop doesn't quite work right yet
+ #[allow(unused_variables)]
+ Ok(x) => res,
Err(e) => Err(e),
}
}
@@ -1331,11 +1351,19 @@ impl<T, E> Result<T, E> {
/// assert_eq!(x.or(y), Ok(2));
/// ```
#[inline]
+ #[rustc_const_unstable(feature = "const_result_drop", issue = "92384")]
#[stable(feature = "rust1", since = "1.0.0")]
- pub fn or<F>(self, res: Result<T, F>) -> Result<T, F> {
+ pub const fn or<F>(self, res: Result<T, F>) -> Result<T, F>
+ where
+ T: ~const Drop,
+ E: ~const Drop,
+ F: ~const Drop,
+ {
match self {
Ok(v) => Ok(v),
- Err(_) => res,
+ // FIXME: ~const Drop doesn't quite work right yet
+ #[allow(unused_variables)]
+ Err(e) => res,
}
}
@@ -1387,11 +1415,18 @@ impl<T, E> Result<T, E> {
/// assert_eq!(x.unwrap_or(default), default);
/// ```
#[inline]
+ #[rustc_const_unstable(feature = "const_result_drop", issue = "92384")]
#[stable(feature = "rust1", since = "1.0.0")]
- pub fn unwrap_or(self, default: T) -> T {
+ pub const fn unwrap_or(self, default: T) -> T
+ where
+ T: ~const Drop,
+ E: ~const Drop,
+ {
match self {
Ok(t) => t,
- Err(_) => default,
+ // FIXME: ~const Drop doesn't quite work right yet
+ #[allow(unused_variables)]
+ Err(e) => default,
}
}
From 6a50572c51d81e0aba542f0b0e73c376c7cbb9c2 Mon Sep 17 00:00:00 2001
From: ridwanabdillahi <91507758+ridwanabdillahi@users.noreply.github.com>
Date: Fri, 4 Mar 2022 09:57:40 -0800
Subject: [PATCH 2/5] Support RelWithDebInfo for lld.
---
src/bootstrap/native.rs | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
index a751a6e3ece7f..40ab5d45a4bcd 100644
--- a/src/bootstrap/native.rs
+++ b/src/bootstrap/native.rs
@@ -653,8 +653,16 @@ impl Step for Lld {
// there's probably a lot of reasons you can't do that other than this.
let llvm_config_shim = env::current_exe().unwrap().with_file_name("llvm-config-wrapper");
+ // Re-use the same flags as llvm to control the level of debug information
+ // generated for lld.
+ let profile = match (builder.config.llvm_optimize, builder.config.llvm_release_debuginfo) {
+ (false, _) => "Debug",
+ (true, false) => "Release",
+ (true, true) => "RelWithDebInfo",
+ };
+
cfg.out_dir(&out_dir)
- .profile("Release")
+ .profile(profile)
.env("LLVM_CONFIG_REAL", &llvm_config)
.define("LLVM_CONFIG_PATH", llvm_config_shim)
.define("LLVM_INCLUDE_TESTS", "OFF");
From e8b7371a237451cdc73547b27311fd8d5078521f Mon Sep 17 00:00:00 2001
From: Chris Denton <christophersdenton@gmail.com>
Date: Sat, 5 Mar 2022 17:57:12 +0000
Subject: [PATCH 3/5] Unix `path::absolute`: Fix leading "." component
Testing leading `.` and `..` components were missing from the unix tests.
---
library/std/src/path/tests.rs | 5 +++++
library/std/src/sys/unix/path.rs | 3 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/library/std/src/path/tests.rs b/library/std/src/path/tests.rs
index 8e51433094a69..435e84f8ceff6 100644
--- a/library/std/src/path/tests.rs
+++ b/library/std/src/path/tests.rs
@@ -1719,6 +1719,11 @@ fn test_unix_absolute() {
assert_eq!(absolute("///a/b/c").unwrap(), Path::new("/a/b/c"));
assert_eq!(absolute("/a/b/c/").unwrap(), Path::new("/a/b/c/"));
assert_eq!(absolute("/a/./b/../c/.././..").unwrap(), Path::new("/a/b/../c/../.."));
+
+ // Test leading `.` and `..` components
+ let curdir = crate::env::current_dir().unwrap();
+ assert_eq!(absolute("./a").unwrap().as_os_str(), curdir.join("a").as_os_str());
+ assert_eq!(absolute("../a").unwrap().as_os_str(), curdir.join("../a").as_os_str()); // return /pwd/../a
}
#[test]
diff --git a/library/std/src/sys/unix/path.rs b/library/std/src/sys/unix/path.rs
index 6d6f4c8b8dc63..a98a69e2db8e1 100644
--- a/library/std/src/sys/unix/path.rs
+++ b/library/std/src/sys/unix/path.rs
@@ -28,7 +28,8 @@ pub(crate) fn absolute(path: &Path) -> io::Result<PathBuf> {
// See 4.13 Pathname Resolution, IEEE Std 1003.1-2017
// https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap04.html#tag_04_13
- let mut components = path.components();
+ // Get the components, skipping the redundant leading "." component if it exists.
+ let mut components = path.strip_prefix(".").unwrap_or(path).components();
let path_os = path.as_os_str().bytes();
let mut normalized = if path.is_absolute() {
From 0421af9a4626638c71d59feebd7a35136d53bfb9 Mon Sep 17 00:00:00 2001
From: Chris Denton <christophersdenton@gmail.com>
Date: Sat, 5 Mar 2022 17:58:08 +0000
Subject: [PATCH 4/5] Use `as_os_str` to compare exact paths
---
library/std/src/path/tests.rs | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/library/std/src/path/tests.rs b/library/std/src/path/tests.rs
index 435e84f8ceff6..6e863787b7f39 100644
--- a/library/std/src/path/tests.rs
+++ b/library/std/src/path/tests.rs
@@ -1710,15 +1710,18 @@ fn test_unix_absolute() {
let relative = "a/b";
let mut expected = crate::env::current_dir().unwrap();
expected.push(relative);
- assert_eq!(absolute(relative).unwrap(), expected);
+ assert_eq!(absolute(relative).unwrap().as_os_str(), expected.as_os_str());
// Test how components are collected.
- assert_eq!(absolute("/a/b/c").unwrap(), Path::new("/a/b/c"));
- assert_eq!(absolute("/a//b/c").unwrap(), Path::new("/a/b/c"));
- assert_eq!(absolute("//a/b/c").unwrap(), Path::new("//a/b/c"));
- assert_eq!(absolute("///a/b/c").unwrap(), Path::new("/a/b/c"));
- assert_eq!(absolute("/a/b/c/").unwrap(), Path::new("/a/b/c/"));
- assert_eq!(absolute("/a/./b/../c/.././..").unwrap(), Path::new("/a/b/../c/../.."));
+ assert_eq!(absolute("/a/b/c").unwrap().as_os_str(), Path::new("/a/b/c").as_os_str());
+ assert_eq!(absolute("/a//b/c").unwrap().as_os_str(), Path::new("/a/b/c").as_os_str());
+ assert_eq!(absolute("//a/b/c").unwrap().as_os_str(), Path::new("//a/b/c").as_os_str());
+ assert_eq!(absolute("///a/b/c").unwrap().as_os_str(), Path::new("/a/b/c").as_os_str());
+ assert_eq!(absolute("/a/b/c/").unwrap().as_os_str(), Path::new("/a/b/c/").as_os_str());
+ assert_eq!(
+ absolute("/a/./b/../c/.././..").unwrap().as_os_str(),
+ Path::new("/a/b/../c/../..").as_os_str()
+ );
// Test leading `.` and `..` components
let curdir = crate::env::current_dir().unwrap();
From 62a65945b7380c58013c45b3cb41a484b3b8437f Mon Sep 17 00:00:00 2001
From: Gentoli <gentoli@live.com>
Date: Mon, 3 Jan 2022 06:25:42 -0500
Subject: [PATCH 5/5] doc: `Iterator::partition` use partial type hints
---
library/core/src/iter/traits/iterator.rs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/library/core/src/iter/traits/iterator.rs b/library/core/src/iter/traits/iterator.rs
index 5a361edecd9c0..f5c0a3b5cd849 100644
--- a/library/core/src/iter/traits/iterator.rs
+++ b/library/core/src/iter/traits/iterator.rs
@@ -1877,9 +1877,9 @@ pub trait Iterator {
/// ```
/// let a = [1, 2, 3];
///
- /// let (even, odd): (Vec<i32>, Vec<i32>) = a
- /// .iter()
- /// .partition(|&n| n % 2 == 0);
+ /// let (even, odd): (Vec<_>, Vec<_>) = a
+ /// .into_iter()
+ /// .partition(|n| n % 2 == 0);
///
/// assert_eq!(even, vec![2]);
/// assert_eq!(odd, vec![1, 3]);