From 99599db8f01dac55f7e29e447480aa9ad566c122 Mon Sep 17 00:00:00 2001
From: Daniyar Nurmukhamet <nurmukhametdaniyar@gmail.com>
Date: Sun, 2 Jul 2023 10:07:52 +0600
Subject: [PATCH 1/3] fixed documentation of from<CString> for Rc<CStr>: Arc ->
Rc
---
library/alloc/src/ffi/c_str.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/library/alloc/src/ffi/c_str.rs b/library/alloc/src/ffi/c_str.rs
index f99395c72aa..62856fc9a49 100644
--- a/library/alloc/src/ffi/c_str.rs
+++ b/library/alloc/src/ffi/c_str.rs
@@ -888,7 +888,7 @@ impl From<&CStr> for Arc<CStr> {
#[stable(feature = "shared_from_slice2", since = "1.24.0")]
impl From<CString> for Rc<CStr> {
/// Converts a [`CString`] into an <code>[Rc]<[CStr]></code> by moving the [`CString`]
- /// data into a new [`Arc`] buffer.
+ /// data into a new [`Rc`] buffer.
#[inline]
fn from(s: CString) -> Rc<CStr> {
let rc: Rc<[u8]> = Rc::from(s.into_inner());
From c7847e991ab1e86a8a6052ac49f0c6a2e1344f17 Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume.gomez@huawei.com>
Date: Sun, 2 Jul 2023 11:14:31 +0200
Subject: [PATCH 2/3] Migrate GUI colors test to original CSS color format
---
tests/rustdoc-gui/notable-trait.goml | 30 ++++++++++++++--------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/tests/rustdoc-gui/notable-trait.goml b/tests/rustdoc-gui/notable-trait.goml
index 371931d51fc..e10bb538f07 100644
--- a/tests/rustdoc-gui/notable-trait.goml
+++ b/tests/rustdoc-gui/notable-trait.goml
@@ -175,11 +175,11 @@ call-function: (
"check-colors",
{
"theme": "ayu",
- "link_color": "rgb(57, 175, 215)",
- "content_color": "rgb(230, 225, 207)",
- "header_color": "rgb(255, 255, 255)",
- "type_color": "rgb(255, 160, 165)",
- "trait_color": "rgb(57, 175, 215)",
+ "link_color": "#39afd7",
+ "content_color": "#e6e1cf",
+ "header_color": "#fff",
+ "type_color": "#ffa0a5",
+ "trait_color": "#39afd7",
},
)
@@ -187,11 +187,11 @@ call-function: (
"check-colors",
{
"theme": "dark",
- "link_color": "rgb(210, 153, 29)",
- "content_color": "rgb(221, 221, 221)",
- "header_color": "rgb(221, 221, 221)",
- "type_color": "rgb(45, 191, 184)",
- "trait_color": "rgb(183, 140, 242)",
+ "link_color": "#d2991d",
+ "content_color": "#ddd",
+ "header_color": "#ddd",
+ "type_color": "#2dbfb8",
+ "trait_color": "#b78cf2",
},
)
@@ -199,11 +199,11 @@ call-function: (
"check-colors",
{
"theme": "light",
- "link_color": "rgb(56, 115, 173)",
- "content_color": "rgb(0, 0, 0)",
- "header_color": "rgb(0, 0, 0)",
- "type_color": "rgb(173, 55, 138)",
- "trait_color": "rgb(110, 79, 201)",
+ "link_color": "#3873ad",
+ "content_color": "black",
+ "header_color": "black",
+ "type_color": "#ad378a",
+ "trait_color": "#6e4fc9",
},
)
From b913f5593d2e2698d18034b56dd538ee745f1adc Mon Sep 17 00:00:00 2001
From: Mu001999 <mu001999@outlook.com>
Date: Sun, 2 Jul 2023 17:53:44 +0800
Subject: [PATCH 3/3] Suggest `x build library` for a custom toolchain that
fails to load `core`
---
compiler/rustc_metadata/messages.ftl | 3 +++
compiler/rustc_metadata/src/errors.rs | 14 ++++++++++----
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/compiler/rustc_metadata/messages.ftl b/compiler/rustc_metadata/messages.ftl
index 13b3dac85d1..cc58d51befd 100644
--- a/compiler/rustc_metadata/messages.ftl
+++ b/compiler/rustc_metadata/messages.ftl
@@ -25,6 +25,9 @@ metadata_conflicting_alloc_error_handler =
metadata_conflicting_global_alloc =
the `#[global_allocator]` in {$other_crate_name} conflicts with global allocator in: {$crate_name}
+metadata_consider_adding_std =
+ consider adding the standard library to the sysroot with `x build library --target {$locator_triple}`
+
metadata_consider_building_std =
consider building the standard library from source with `cargo build -Zbuild-std`
diff --git a/compiler/rustc_metadata/src/errors.rs b/compiler/rustc_metadata/src/errors.rs
index fca06c0f47c..b6c82376f4e 100644
--- a/compiler/rustc_metadata/src/errors.rs
+++ b/compiler/rustc_metadata/src/errors.rs
@@ -646,12 +646,18 @@ impl IntoDiagnostic<'_> for CannotFindCrate {
} else {
diag.note(fluent::metadata_target_no_std_support);
}
- // NOTE: this suggests using rustup, even though the user may not have it installed.
- // That's because they could choose to install it; or this may give them a hint which
- // target they need to install from their distro.
+
if self.missing_core {
- diag.help(fluent::metadata_consider_downloading_target);
+ if env!("CFG_RELEASE_CHANNEL") == "dev" {
+ diag.help(fluent::metadata_consider_adding_std);
+ } else {
+ // NOTE: this suggests using rustup, even though the user may not have it installed.
+ // That's because they could choose to install it; or this may give them a hint which
+ // target they need to install from their distro.
+ diag.help(fluent::metadata_consider_downloading_target);
+ }
}
+
// Suggest using #![no_std]. #[no_core] is unstable and not really supported anyway.
// NOTE: this is a dummy span if `extern crate std` was injected by the compiler.
// If it's not a dummy, that means someone added `extern crate std` explicitly and