From 8e3ce43de9844a869e85eafca531079f8e89b732 Mon Sep 17 00:00:00 2001
From: Dylan MacKenzie <ecstaticmorse@gmail.com>
Date: Mon, 14 Sep 2020 16:54:53 -0700
Subject: [PATCH 01/25] Add `Engine::pass_name` to differentiate dataflow runs
---
.../src/dataflow/framework/engine.rs | 22 +++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/compiler/rustc_mir/src/dataflow/framework/engine.rs b/compiler/rustc_mir/src/dataflow/framework/engine.rs
index 0b5b437d186aa..757709f90ff8e 100644
--- a/compiler/rustc_mir/src/dataflow/framework/engine.rs
+++ b/compiler/rustc_mir/src/dataflow/framework/engine.rs
@@ -84,6 +84,7 @@ where
def_id: DefId,
dead_unwinds: Option<&'a BitSet<BasicBlock>>,
entry_sets: IndexVec<BasicBlock, A::Domain>,
+ pass_name: Option<&'static str>,
analysis: A,
/// Cached, cumulative transfer functions for each block.
@@ -174,6 +175,7 @@ where
body,
def_id,
dead_unwinds: None,
+ pass_name: None,
entry_sets,
apply_trans_for_block,
}
@@ -189,6 +191,15 @@ where
self
}
+ /// Adds an identifier to the graphviz output for this particular run of a dataflow analysis.
+ ///
+ /// Some analyses are run multiple times in the compilation pipeline. Give them a `pass_name`
+ /// to differentiate them. Otherwise, only the results for the latest run will be saved.
+ pub fn pass_name(mut self, name: &'static str) -> Self {
+ self.pass_name = Some(name);
+ self
+ }
+
/// Computes the fixpoint for this dataflow problem and returns it.
pub fn iterate_to_fixpoint(self) -> Results<'tcx, A>
where
@@ -202,6 +213,7 @@ where
mut entry_sets,
tcx,
apply_trans_for_block,
+ pass_name,
..
} = self;
@@ -249,7 +261,7 @@ where
let results = Results { analysis, entry_sets };
- let res = write_graphviz_results(tcx, def_id, &body, &results);
+ let res = write_graphviz_results(tcx, def_id, &body, &results, pass_name);
if let Err(e) = res {
warn!("Failed to write graphviz dataflow results: {}", e);
}
@@ -267,6 +279,7 @@ fn write_graphviz_results<A>(
def_id: DefId,
body: &mir::Body<'tcx>,
results: &Results<'tcx, A>,
+ pass_name: Option<&'static str>,
) -> std::io::Result<()>
where
A: Analysis<'tcx>,
@@ -285,12 +298,17 @@ where
None if tcx.sess.opts.debugging_opts.dump_mir_dataflow
&& dump_enabled(tcx, A::NAME, def_id) =>
{
+ // FIXME: Use some variant of `pretty::dump_path` for this
let mut path = PathBuf::from(&tcx.sess.opts.debugging_opts.dump_mir_dir);
+ let crate_name = tcx.crate_name(def_id.krate);
let item_name = ty::print::with_forced_impl_filename_line(|| {
tcx.def_path(def_id).to_filename_friendly_no_crate()
});
- path.push(format!("rustc.{}.{}.dot", item_name, A::NAME));
+
+ let pass_name = pass_name.map(|s| format!(".{}", s)).unwrap_or_default();
+
+ path.push(format!("{}.{}.{}{}.dot", crate_name, item_name, A::NAME, pass_name));
path
}
From 0475c365fedb8243219247db1186d590032b550e Mon Sep 17 00:00:00 2001
From: Dylan MacKenzie <ecstaticmorse@gmail.com>
Date: Mon, 14 Sep 2020 17:13:47 -0700
Subject: [PATCH 02/25] Add pass names to some common dataflow analyses
---
compiler/rustc_mir/src/borrow_check/mod.rs | 4 ++++
.../rustc_mir/src/transform/check_consts/validation.rs | 1 +
compiler/rustc_mir/src/transform/elaborate_drops.rs | 3 +++
compiler/rustc_mir/src/transform/generator.rs | 7 +++++--
src/tools/clippy/clippy_lints/src/redundant_clone.rs | 1 +
5 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/compiler/rustc_mir/src/borrow_check/mod.rs b/compiler/rustc_mir/src/borrow_check/mod.rs
index acd9e3dcf3fcd..a6f06fee3b27b 100644
--- a/compiler/rustc_mir/src/borrow_check/mod.rs
+++ b/compiler/rustc_mir/src/borrow_check/mod.rs
@@ -205,6 +205,7 @@ fn do_mir_borrowck<'a, 'tcx>(
let mut flow_inits = MaybeInitializedPlaces::new(tcx, &body, &mdpe)
.into_engine(tcx, &body, def.did.to_def_id())
+ .pass_name("borrowck")
.iterate_to_fixpoint()
.into_results_cursor(&body);
@@ -264,12 +265,15 @@ fn do_mir_borrowck<'a, 'tcx>(
let flow_borrows = Borrows::new(tcx, &body, regioncx.clone(), &borrow_set)
.into_engine(tcx, &body, def.did.to_def_id())
+ .pass_name("borrowck")
.iterate_to_fixpoint();
let flow_uninits = MaybeUninitializedPlaces::new(tcx, &body, &mdpe)
.into_engine(tcx, &body, def.did.to_def_id())
+ .pass_name("borrowck")
.iterate_to_fixpoint();
let flow_ever_inits = EverInitializedPlaces::new(tcx, &body, &mdpe)
.into_engine(tcx, &body, def.did.to_def_id())
+ .pass_name("borrowck")
.iterate_to_fixpoint();
let movable_generator = match tcx.hir().get(id) {
diff --git a/compiler/rustc_mir/src/transform/check_consts/validation.rs b/compiler/rustc_mir/src/transform/check_consts/validation.rs
index e8411b121e394..ef306813825f5 100644
--- a/compiler/rustc_mir/src/transform/check_consts/validation.rs
+++ b/compiler/rustc_mir/src/transform/check_consts/validation.rs
@@ -57,6 +57,7 @@ impl Qualifs<'mir, 'tcx> {
MaybeMutBorrowedLocals::mut_borrows_only(tcx, &body, param_env)
.unsound_ignore_borrow_on_drop()
.into_engine(tcx, &body, def_id.to_def_id())
+ .pass_name("const_qualification")
.iterate_to_fixpoint()
.into_results_cursor(&body)
});
diff --git a/compiler/rustc_mir/src/transform/elaborate_drops.rs b/compiler/rustc_mir/src/transform/elaborate_drops.rs
index 5f1930693568c..a8b2ee5705f1f 100644
--- a/compiler/rustc_mir/src/transform/elaborate_drops.rs
+++ b/compiler/rustc_mir/src/transform/elaborate_drops.rs
@@ -44,6 +44,7 @@ impl<'tcx> MirPass<'tcx> for ElaborateDrops {
let inits = MaybeInitializedPlaces::new(tcx, body, &env)
.into_engine(tcx, body, def_id)
.dead_unwinds(&dead_unwinds)
+ .pass_name("elaborate_drops")
.iterate_to_fixpoint()
.into_results_cursor(body);
@@ -51,6 +52,7 @@ impl<'tcx> MirPass<'tcx> for ElaborateDrops {
.mark_inactive_variants_as_uninit()
.into_engine(tcx, body, def_id)
.dead_unwinds(&dead_unwinds)
+ .pass_name("elaborate_drops")
.iterate_to_fixpoint()
.into_results_cursor(body);
@@ -83,6 +85,7 @@ fn find_dead_unwinds<'tcx>(
let mut dead_unwinds = BitSet::new_empty(body.basic_blocks().len());
let mut flow_inits = MaybeInitializedPlaces::new(tcx, body, &env)
.into_engine(tcx, body, def_id)
+ .pass_name("find_dead_unwinds")
.iterate_to_fixpoint()
.into_results_cursor(body);
for (bb, bb_data) in body.basic_blocks().iter_enumerated() {
diff --git a/compiler/rustc_mir/src/transform/generator.rs b/compiler/rustc_mir/src/transform/generator.rs
index 78cedec502007..1fffcf8151537 100644
--- a/compiler/rustc_mir/src/transform/generator.rs
+++ b/compiler/rustc_mir/src/transform/generator.rs
@@ -467,8 +467,10 @@ fn locals_live_across_suspend_points(
// Calculate the MIR locals which have been previously
// borrowed (even if they are still active).
- let borrowed_locals_results =
- MaybeBorrowedLocals::all_borrows().into_engine(tcx, body_ref, def_id).iterate_to_fixpoint();
+ let borrowed_locals_results = MaybeBorrowedLocals::all_borrows()
+ .into_engine(tcx, body_ref, def_id)
+ .pass_name("generator")
+ .iterate_to_fixpoint();
let mut borrowed_locals_cursor =
dataflow::ResultsCursor::new(body_ref, &borrowed_locals_results);
@@ -484,6 +486,7 @@ fn locals_live_across_suspend_points(
// Calculate the liveness of MIR locals ignoring borrows.
let mut liveness = MaybeLiveLocals
.into_engine(tcx, body_ref, def_id)
+ .pass_name("generator")
.iterate_to_fixpoint()
.into_results_cursor(body_ref);
diff --git a/src/tools/clippy/clippy_lints/src/redundant_clone.rs b/src/tools/clippy/clippy_lints/src/redundant_clone.rs
index 57a45e628db61..1615f19237096 100644
--- a/src/tools/clippy/clippy_lints/src/redundant_clone.rs
+++ b/src/tools/clippy/clippy_lints/src/redundant_clone.rs
@@ -87,6 +87,7 @@ impl<'tcx> LateLintPass<'tcx> for RedundantClone {
let maybe_storage_live_result = MaybeStorageLive
.into_engine(cx.tcx, mir, def_id.to_def_id())
+ .pass_name("redundant_clone")
.iterate_to_fixpoint()
.into_results_cursor(mir);
let mut possible_borrower = {
From 3f0f40904c18bce9915b5fe2a1d017f3906c0d26 Mon Sep 17 00:00:00 2001
From: Erik Hofmayer <ehofmayer@outlook.de>
Date: Sun, 20 Sep 2020 15:50:44 +0200
Subject: [PATCH 03/25] Documented From impls in std/sync/mpsc/mod.rs
---
library/std/src/sync/mpsc/mod.rs | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/library/std/src/sync/mpsc/mod.rs b/library/std/src/sync/mpsc/mod.rs
index 073f969bbe25b..d23a8161a229c 100644
--- a/library/std/src/sync/mpsc/mod.rs
+++ b/library/std/src/sync/mpsc/mod.rs
@@ -1531,6 +1531,9 @@ impl<T: Send> error::Error for TrySendError<T> {
#[stable(feature = "mpsc_error_conversions", since = "1.24.0")]
impl<T> From<SendError<T>> for TrySendError<T> {
+ /// Converts a `SendError<T>` into a `TrySendError<T>`.
+ /// This conversion always returns a `TrySendError::Disconnected` containing the data in the `SendError<T>`.
+ /// No data is allocated on the heap.
fn from(err: SendError<T>) -> TrySendError<T> {
match err {
SendError(t) => TrySendError::Disconnected(t),
@@ -1576,6 +1579,9 @@ impl error::Error for TryRecvError {
#[stable(feature = "mpsc_error_conversions", since = "1.24.0")]
impl From<RecvError> for TryRecvError {
+ /// Converts a `RecvError` into a `TryRecvError`.
+ /// This conversion always returns `TryRecvError::Disconnected`.
+ /// No data is allocated on the heap.
fn from(err: RecvError) -> TryRecvError {
match err {
RecvError => TryRecvError::Disconnected,
@@ -1606,6 +1612,9 @@ impl error::Error for RecvTimeoutError {
#[stable(feature = "mpsc_error_conversions", since = "1.24.0")]
impl From<RecvError> for RecvTimeoutError {
+ /// Converts a `RecvError` into a `RecvTimeoutError`.
+ /// This conversion always returns `RecvTimeoutError::Disconnected`.
+ /// No data is allocated on the heap.
fn from(err: RecvError) -> RecvTimeoutError {
match err {
RecvError => RecvTimeoutError::Disconnected,
From 16eee2a04a4c3a93d398728d7a0c05a8afb6ca94 Mon Sep 17 00:00:00 2001
From: Erik Hofmayer <ehofmayer@outlook.de>
Date: Mon, 21 Sep 2020 21:31:01 +0200
Subject: [PATCH 04/25] Applied review comments
---
library/std/src/sync/mpsc/mod.rs | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/library/std/src/sync/mpsc/mod.rs b/library/std/src/sync/mpsc/mod.rs
index d23a8161a229c..dc13c9433f121 100644
--- a/library/std/src/sync/mpsc/mod.rs
+++ b/library/std/src/sync/mpsc/mod.rs
@@ -1532,7 +1532,9 @@ impl<T: Send> error::Error for TrySendError<T> {
#[stable(feature = "mpsc_error_conversions", since = "1.24.0")]
impl<T> From<SendError<T>> for TrySendError<T> {
/// Converts a `SendError<T>` into a `TrySendError<T>`.
+ ///
/// This conversion always returns a `TrySendError::Disconnected` containing the data in the `SendError<T>`.
+ ///
/// No data is allocated on the heap.
fn from(err: SendError<T>) -> TrySendError<T> {
match err {
@@ -1580,7 +1582,9 @@ impl error::Error for TryRecvError {
#[stable(feature = "mpsc_error_conversions", since = "1.24.0")]
impl From<RecvError> for TryRecvError {
/// Converts a `RecvError` into a `TryRecvError`.
+ ///
/// This conversion always returns `TryRecvError::Disconnected`.
+ ///
/// No data is allocated on the heap.
fn from(err: RecvError) -> TryRecvError {
match err {
@@ -1613,7 +1617,9 @@ impl error::Error for RecvTimeoutError {
#[stable(feature = "mpsc_error_conversions", since = "1.24.0")]
impl From<RecvError> for RecvTimeoutError {
/// Converts a `RecvError` into a `RecvTimeoutError`.
+ ///
/// This conversion always returns `RecvTimeoutError::Disconnected`.
+ ///
/// No data is allocated on the heap.
fn from(err: RecvError) -> RecvTimeoutError {
match err {
From 4a6bc77a0160a4540dea03e39642c373ca9f2a69 Mon Sep 17 00:00:00 2001
From: Ivan Tham <pickfire@riseup.net>
Date: Tue, 22 Sep 2020 14:26:15 +0800
Subject: [PATCH 05/25] Liballoc bench vec use mem take not replace
---
library/alloc/benches/vec.rs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/library/alloc/benches/vec.rs b/library/alloc/benches/vec.rs
index b295342f3610e..687efa8e9e777 100644
--- a/library/alloc/benches/vec.rs
+++ b/library/alloc/benches/vec.rs
@@ -241,7 +241,7 @@ fn bench_extend_recycle(b: &mut Bencher) {
let mut data = vec![0; 1000];
b.iter(|| {
- let tmp = std::mem::replace(&mut data, Vec::new());
+ let tmp = std::mem::take(&mut data);
let mut to_extend = black_box(Vec::new());
to_extend.extend(tmp.into_iter());
data = black_box(to_extend);
@@ -500,7 +500,7 @@ fn bench_in_place_recycle(b: &mut Bencher) {
let mut data = vec![0; 1000];
b.iter(|| {
- let tmp = std::mem::replace(&mut data, Vec::new());
+ let tmp = std::mem::take(&mut data);
data = black_box(
tmp.into_iter()
.enumerate()
@@ -520,7 +520,7 @@ fn bench_in_place_zip_recycle(b: &mut Bencher) {
rng.fill_bytes(&mut subst[..]);
b.iter(|| {
- let tmp = std::mem::replace(&mut data, Vec::new());
+ let tmp = std::mem::take(&mut data);
let mangled = tmp
.into_iter()
.zip(subst.iter().copied())
From 0082d201f1ea8ce106f1c71562d5f2d0d2e35513 Mon Sep 17 00:00:00 2001
From: follower <follower@rancidbacon.com>
Date: Tue, 22 Sep 2020 20:54:07 +1200
Subject: [PATCH 06/25] Typo fix: "satsify" -> "satisfy"
---
library/alloc/src/vec.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/library/alloc/src/vec.rs b/library/alloc/src/vec.rs
index 8c0b6af54829b..d3845cbbc5e06 100644
--- a/library/alloc/src/vec.rs
+++ b/library/alloc/src/vec.rs
@@ -412,7 +412,7 @@ impl<T> Vec<T> {
/// (at least, it's highly likely to be incorrect if it wasn't).
/// * `T` needs to have the same size and alignment as what `ptr` was allocated with.
/// (`T` having a less strict alignment is not sufficient, the alignment really
- /// needs to be equal to satsify the [`dealloc`] requirement that memory must be
+ /// needs to be equal to satisfy the [`dealloc`] requirement that memory must be
/// allocated and deallocated with the same layout.)
/// * `length` needs to be less than or equal to `capacity`.
/// * `capacity` needs to be the capacity that the pointer was allocated with.
From 179f63dafcf9463b48d82e8698a844e18bf94370 Mon Sep 17 00:00:00 2001
From: Bastian Kauschke <bastian_kauschke@hotmail.de>
Date: Tue, 22 Sep 2020 21:35:43 +0200
Subject: [PATCH 07/25] add array from_ref
---
library/core/src/array/mod.rs | 14 ++++++++++++++
library/core/tests/array.rs | 17 ++++++++++++++++-
library/core/tests/lib.rs | 1 +
3 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/library/core/src/array/mod.rs b/library/core/src/array/mod.rs
index c1d3aca6fdd4f..5730074bf2747 100644
--- a/library/core/src/array/mod.rs
+++ b/library/core/src/array/mod.rs
@@ -19,6 +19,20 @@ mod iter;
#[unstable(feature = "array_value_iter", issue = "65798")]
pub use iter::IntoIter;
+/// Converts a reference to `T` into a reference to an array of length 1 (without copying).
+#[unstable(feature = "array_from_ref", issue = "none")]
+pub fn from_ref<T>(s: &T) -> &[T; 1] {
+ // SAFETY: Converting `&T` to `&[T; 1]` is sound.
+ unsafe { &*(s as *const T).cast::<[T; 1]>() }
+}
+
+/// Converts a mutable reference to `T` into a mutable reference to an array of length 1 (without copying).
+#[unstable(feature = "array_from_ref", issue = "none")]
+pub fn from_mut<T>(s: &mut T) -> &mut [T; 1] {
+ // SAFETY: Converting `&mut T` to `&mut [T; 1]` is sound.
+ unsafe { &mut *(s as *mut T).cast::<[T; 1]>() }
+}
+
/// Utility trait implemented only on arrays of fixed size
///
/// This trait can be used to implement other traits on fixed-size arrays
diff --git a/library/core/tests/array.rs b/library/core/tests/array.rs
index 5aba1a5d958d1..dbcea2747a00d 100644
--- a/library/core/tests/array.rs
+++ b/library/core/tests/array.rs
@@ -1,4 +1,4 @@
-use core::array::{FixedSizeArray, IntoIter};
+use core::array::{self, FixedSizeArray, IntoIter};
use core::convert::TryFrom;
#[test]
@@ -19,6 +19,21 @@ fn fixed_size_array() {
assert_eq!(FixedSizeArray::as_mut_slice(&mut empty_zero_sized).len(), 0);
}
+#[test]
+fn array_from_ref() {
+ let value: String = "Hello World!".into();
+ let arr: &[String; 1] = array::from_ref(&value);
+ assert_eq!(&[value.clone()], arr);
+}
+
+#[test]
+fn array_from_mut() {
+ let mut value: String = "Hello World".into();
+ let arr: &mut [String; 1] = array::from_mut(&mut value);
+ arr[0].push_str("!");
+ assert_eq!(&value, "Hello World!");
+}
+
#[test]
fn array_try_from() {
macro_rules! test {
diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs
index 7e75c7cf47bf6..d8b36beb3e085 100644
--- a/library/core/tests/lib.rs
+++ b/library/core/tests/lib.rs
@@ -1,5 +1,6 @@
#![feature(alloc_layout_extra)]
#![feature(array_chunks)]
+#![feature(array_from_ref)]
#![feature(array_methods)]
#![feature(array_map)]
#![feature(array_windows)]
From b6e72837fd36f65f7ff73dcf6e915971296a9af8 Mon Sep 17 00:00:00 2001
From: Alexis Bourget <alexis.bourget@gmail.com>
Date: Tue, 22 Sep 2020 23:36:08 +0200
Subject: [PATCH 08/25] Use Self more in core/src/cmp.rs
---
library/core/src/cmp.rs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/library/core/src/cmp.rs b/library/core/src/cmp.rs
index dde442aa7b52d..ee79a94cc66ab 100644
--- a/library/core/src/cmp.rs
+++ b/library/core/src/cmp.rs
@@ -726,19 +726,19 @@ impl PartialOrd for Ordering {
/// }
///
/// impl PartialOrd for Person {
-/// fn partial_cmp(&self, other: &Person) -> Option<Ordering> {
+/// fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
/// Some(self.cmp(other))
/// }
/// }
///
/// impl Ord for Person {
-/// fn cmp(&self, other: &Person) -> Ordering {
+/// fn cmp(&self, other: &Self) -> Ordering {
/// self.height.cmp(&other.height)
/// }
/// }
///
/// impl PartialEq for Person {
-/// fn eq(&self, other: &Person) -> bool {
+/// fn eq(&self, other: &Self) -> bool {
/// self.height == other.height
/// }
/// }
From 87a5dec4db20aa4e45b0db63f762681de084ad58 Mon Sep 17 00:00:00 2001
From: Alexis Bourget <alexis.bourget@gmail.com>
Date: Wed, 23 Sep 2020 00:16:16 +0200
Subject: [PATCH 09/25] Use Self more in core in doc when possible
---
library/core/src/marker.rs | 4 +-
library/core/src/ops/arith.rs | 22 +++++------
library/core/src/ops/bit.rs | 69 ++++++++++++++++++-----------------
library/core/src/ops/mod.rs | 12 +++---
4 files changed, 55 insertions(+), 52 deletions(-)
diff --git a/library/core/src/marker.rs b/library/core/src/marker.rs
index 9340b591ebd70..cdf742057b7b6 100644
--- a/library/core/src/marker.rs
+++ b/library/core/src/marker.rs
@@ -643,9 +643,9 @@ macro_rules! impls {
/// }
///
/// impl<R: ResType> ExternalResource<R> {
-/// fn new() -> ExternalResource<R> {
+/// fn new() -> Self {
/// let size_of_res = mem::size_of::<R>();
-/// ExternalResource {
+/// Self {
/// resource_handle: foreign_lib::new(size_of_res),
/// resource_type: PhantomData,
/// }
diff --git a/library/core/src/ops/arith.rs b/library/core/src/ops/arith.rs
index bdf93baa1b8f9..19f86ced5007c 100644
--- a/library/core/src/ops/arith.rs
+++ b/library/core/src/ops/arith.rs
@@ -128,10 +128,10 @@ add_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
/// }
///
/// impl Sub for Point {
-/// type Output = Point;
+/// type Output = Self;
///
-/// fn sub(self, other: Point) -> Point {
-/// Point {
+/// fn sub(self, other: Self) -> Self::Output {
+/// Self {
/// x: self.x - other.x,
/// y: self.y - other.y,
/// }
@@ -241,7 +241,7 @@ sub_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
/// // Reduce to lowest terms by dividing by the greatest common
/// // divisor.
/// let gcd = gcd(numerator, denominator);
-/// Rational {
+/// Self {
/// numerator: numerator / gcd,
/// denominator: denominator / gcd,
/// }
@@ -255,7 +255,7 @@ sub_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
/// fn mul(self, rhs: Self) -> Self {
/// let numerator = self.numerator * rhs.numerator;
/// let denominator = self.denominator * rhs.denominator;
-/// Rational::new(numerator, denominator)
+/// Self::new(numerator, denominator)
/// }
/// }
///
@@ -291,7 +291,7 @@ sub_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
/// type Output = Self;
///
/// fn mul(self, rhs: Scalar) -> Self::Output {
-/// Vector { value: self.value.iter().map(|v| v * rhs.value).collect() }
+/// Self { value: self.value.iter().map(|v| v * rhs.value).collect() }
/// }
/// }
///
@@ -369,7 +369,7 @@ mul_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
/// // Reduce to lowest terms by dividing by the greatest common
/// // divisor.
/// let gcd = gcd(numerator, denominator);
-/// Rational {
+/// Self {
/// numerator: numerator / gcd,
/// denominator: denominator / gcd,
/// }
@@ -387,7 +387,7 @@ mul_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
///
/// let numerator = self.numerator * rhs.denominator;
/// let denominator = self.denominator * rhs.numerator;
-/// Rational::new(numerator, denominator)
+/// Self::new(numerator, denominator)
/// }
/// }
///
@@ -423,7 +423,7 @@ mul_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
/// type Output = Self;
///
/// fn div(self, rhs: Scalar) -> Self::Output {
-/// Vector { value: self.value.iter().map(|v| v / rhs.value).collect() }
+/// Self { value: self.value.iter().map(|v| v / rhs.value).collect() }
/// }
/// }
///
@@ -515,7 +515,7 @@ div_impl_float! { f32 f64 }
/// let len = self.slice.len();
/// let rem = len % modulus;
/// let start = len - rem;
-/// SplitSlice {slice: &self.slice[start..]}
+/// Self {slice: &self.slice[start..]}
/// }
/// }
///
@@ -615,7 +615,7 @@ rem_impl_float! { f32 f64 }
/// }
///
/// impl Neg for Sign {
-/// type Output = Sign;
+/// type Output = Self;
///
/// fn neg(self) -> Self::Output {
/// match self {
diff --git a/library/core/src/ops/bit.rs b/library/core/src/ops/bit.rs
index 3d71e0b0002c2..6120da50c3cdf 100644
--- a/library/core/src/ops/bit.rs
+++ b/library/core/src/ops/bit.rs
@@ -15,7 +15,7 @@
/// }
///
/// impl Not for Answer {
-/// type Output = Answer;
+/// type Output = Self;
///
/// fn not(self) -> Self::Output {
/// match self {
@@ -85,7 +85,7 @@ not_impl! { bool usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
///
/// // rhs is the "right-hand side" of the expression `a & b`
/// fn bitand(self, rhs: Self) -> Self::Output {
-/// Scalar(self.0 & rhs.0)
+/// Self(self.0 & rhs.0)
/// }
/// }
///
@@ -106,10 +106,13 @@ not_impl! { bool usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
/// impl BitAnd for BooleanVector {
/// type Output = Self;
///
-/// fn bitand(self, BooleanVector(rhs): Self) -> Self::Output {
-/// let BooleanVector(lhs) = self;
+/// fn bitand(self, Self(rhs): Self) -> Self::Output {
+/// let Self(lhs) = self;
/// assert_eq!(lhs.len(), rhs.len());
-/// BooleanVector(lhs.iter().zip(rhs.iter()).map(|(x, y)| *x && *y).collect())
+/// Self(lhs.iter()
+/// .zip(rhs.iter())
+/// .map(|(x, y)| *x && *y)
+/// .collect())
/// }
/// }
///
@@ -179,8 +182,8 @@ bitand_impl! { bool usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
/// type Output = Self;
///
/// // rhs is the "right-hand side" of the expression `a | b`
-/// fn bitor(self, rhs: Self) -> Self {
-/// Scalar(self.0 | rhs.0)
+/// fn bitor(self, rhs: Self) -> Self::Output {
+/// Self(self.0 | rhs.0)
/// }
/// }
///
@@ -201,10 +204,10 @@ bitand_impl! { bool usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
/// impl BitOr for BooleanVector {
/// type Output = Self;
///
-/// fn bitor(self, BooleanVector(rhs): Self) -> Self::Output {
-/// let BooleanVector(lhs) = self;
+/// fn bitor(self, Self(rhs): Self) -> Self::Output {
+/// let Self(lhs) = self;
/// assert_eq!(lhs.len(), rhs.len());
-/// BooleanVector(lhs.iter().zip(rhs.iter()).map(|(x, y)| *x || *y).collect())
+/// Self(lhs.iter().zip(rhs.iter()).map(|(x, y)| *x || *y).collect())
/// }
/// }
///
@@ -275,7 +278,7 @@ bitor_impl! { bool usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
///
/// // rhs is the "right-hand side" of the expression `a ^ b`
/// fn bitxor(self, rhs: Self) -> Self::Output {
-/// Scalar(self.0 ^ rhs.0)
+/// Self(self.0 ^ rhs.0)
/// }
/// }
///
@@ -296,13 +299,13 @@ bitor_impl! { bool usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
/// impl BitXor for BooleanVector {
/// type Output = Self;
///
-/// fn bitxor(self, BooleanVector(rhs): Self) -> Self::Output {
-/// let BooleanVector(lhs) = self;
+/// fn bitxor(self, Self(rhs): Self) -> Self::Output {
+/// let Self(lhs) = self;
/// assert_eq!(lhs.len(), rhs.len());
-/// BooleanVector(lhs.iter()
-/// .zip(rhs.iter())
-/// .map(|(x, y)| (*x || *y) && !(*x && *y))
-/// .collect())
+/// Self(lhs.iter()
+/// .zip(rhs.iter())
+/// .map(|(x, y)| (*x || *y) && !(*x && *y))
+/// .collect())
/// }
/// }
///
@@ -375,9 +378,9 @@ bitxor_impl! { bool usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
/// impl Shl<Scalar> for Scalar {
/// type Output = Self;
///
-/// fn shl(self, Scalar(rhs): Self) -> Scalar {
-/// let Scalar(lhs) = self;
-/// Scalar(lhs << rhs)
+/// fn shl(self, Self(rhs): Self) -> Self::Output {
+/// let Self(lhs) = self;
+/// Self(lhs << rhs)
/// }
/// }
///
@@ -400,10 +403,10 @@ bitxor_impl! { bool usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
/// fn shl(self, rhs: usize) -> Self::Output {
/// // Rotate the vector by `rhs` places.
/// let (a, b) = self.vec.split_at(rhs);
-/// let mut spun_vector: Vec<T> = vec![];
+/// let mut spun_vector = vec![];
/// spun_vector.extend_from_slice(b);
/// spun_vector.extend_from_slice(a);
-/// SpinVector { vec: spun_vector }
+/// Self { vec: spun_vector }
/// }
/// }
///
@@ -493,9 +496,9 @@ shl_impl_all! { u8 u16 u32 u64 u128 usize i8 i16 i32 i64 isize i128 }
/// impl Shr<Scalar> for Scalar {
/// type Output = Self;
///
-/// fn shr(self, Scalar(rhs): Self) -> Scalar {
-/// let Scalar(lhs) = self;
-/// Scalar(lhs >> rhs)
+/// fn shr(self, Self(rhs): Self) -> Self::Output {
+/// let Self(lhs) = self;
+/// Self(lhs >> rhs)
/// }
/// }
///
@@ -518,10 +521,10 @@ shl_impl_all! { u8 u16 u32 u64 u128 usize i8 i16 i32 i64 isize i128 }
/// fn shr(self, rhs: usize) -> Self::Output {
/// // Rotate the vector by `rhs` places.
/// let (a, b) = self.vec.split_at(self.vec.len() - rhs);
-/// let mut spun_vector: Vec<T> = vec![];
+/// let mut spun_vector = vec![];
/// spun_vector.extend_from_slice(b);
/// spun_vector.extend_from_slice(a);
-/// SpinVector { vec: spun_vector }
+/// Self { vec: spun_vector }
/// }
/// }
///
@@ -606,7 +609,7 @@ shr_impl_all! { u8 u16 u32 u64 u128 usize i8 i16 i32 i64 i128 isize }
/// impl BitAndAssign for Scalar {
/// // rhs is the "right-hand side" of the expression `a &= b`
/// fn bitand_assign(&mut self, rhs: Self) {
-/// *self = Scalar(self.0 & rhs.0)
+/// *self = Self(self.0 & rhs.0)
/// }
/// }
///
@@ -640,11 +643,11 @@ shr_impl_all! { u8 u16 u32 u64 u128 usize i8 i16 i32 i64 i128 isize }
/// // `rhs` is the "right-hand side" of the expression `a &= b`.
/// fn bitand_assign(&mut self, rhs: Self) {
/// assert_eq!(self.0.len(), rhs.0.len());
-/// *self = BooleanVector(self.0
-/// .iter()
-/// .zip(rhs.0.iter())
-/// .map(|(x, y)| *x && *y)
-/// .collect());
+/// *self = Self(self.0
+/// .iter()
+/// .zip(rhs.0.iter())
+/// .map(|(x, y)| *x && *y)
+/// .collect());
/// }
/// }
///
diff --git a/library/core/src/ops/mod.rs b/library/core/src/ops/mod.rs
index 2a4186f9d5db9..354ad6b7b7333 100644
--- a/library/core/src/ops/mod.rs
+++ b/library/core/src/ops/mod.rs
@@ -49,18 +49,18 @@
//! }
//!
//! impl Add for Point {
-//! type Output = Point;
+//! type Output = Self;
//!
-//! fn add(self, other: Point) -> Point {
-//! Point {x: self.x + other.x, y: self.y + other.y}
+//! fn add(self, other: Self) -> Self {
+//! Self {x: self.x + other.x, y: self.y + other.y}
//! }
//! }
//!
//! impl Sub for Point {
-//! type Output = Point;
+//! type Output = Self;
//!
-//! fn sub(self, other: Point) -> Point {
-//! Point {x: self.x - other.x, y: self.y - other.y}
+//! fn sub(self, other: Self) -> Self {
+//! Self {x: self.x - other.x, y: self.y - other.y}
//! }
//! }
//!
From c07890543d13b36180dfbc0b6b6632c2c1dfff3f Mon Sep 17 00:00:00 2001
From: LingMan <LingMan@users.noreply.github.com>
Date: Wed, 23 Sep 2020 00:29:56 +0200
Subject: [PATCH 10/25] Don't use an if guard to check equality with a constant
Match on it directly instead
---
compiler/rustc_attr/src/builtin.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compiler/rustc_attr/src/builtin.rs b/compiler/rustc_attr/src/builtin.rs
index 9951c25200129..1808eb270baa9 100644
--- a/compiler/rustc_attr/src/builtin.rs
+++ b/compiler/rustc_attr/src/builtin.rs
@@ -301,7 +301,7 @@ where
.emit();
};
match issue.parse() {
- Ok(num) if num == 0 => {
+ Ok(0) => {
emit_diag(
"`issue` must not be \"0\", \
use \"none\" instead",
From ec4e9cd12a380bb61791c489baaaae2e9454546d Mon Sep 17 00:00:00 2001
From: Alexis Bourget <alexis.bourget@gmail.com>
Date: Wed, 23 Sep 2020 00:31:37 +0200
Subject: [PATCH 11/25] Use Self in alloc
---
library/alloc/src/collections/binary_heap.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/library/alloc/src/collections/binary_heap.rs b/library/alloc/src/collections/binary_heap.rs
index ea75fa2196502..f2852b1cc2b80 100644
--- a/library/alloc/src/collections/binary_heap.rs
+++ b/library/alloc/src/collections/binary_heap.rs
@@ -30,7 +30,7 @@
//! // Explicitly implement the trait so the queue becomes a min-heap
//! // instead of a max-heap.
//! impl Ord for State {
-//! fn cmp(&self, other: &State) -> Ordering {
+//! fn cmp(&self, other: &Self) -> Ordering {
//! // Notice that the we flip the ordering on costs.
//! // In case of a tie we compare positions - this step is necessary
//! // to make implementations of `PartialEq` and `Ord` consistent.
@@ -41,7 +41,7 @@
//!
//! // `PartialOrd` needs to be implemented as well.
//! impl PartialOrd for State {
-//! fn partial_cmp(&self, other: &State) -> Option<Ordering> {
+//! fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
//! Some(self.cmp(other))
//! }
//! }
From d76b80768c4e5f1ee879af12db30d8930e50f70d Mon Sep 17 00:00:00 2001
From: LingMan <LingMan@users.noreply.github.com>
Date: Wed, 23 Sep 2020 01:09:24 +0200
Subject: [PATCH 12/25] Merge two almost identical match arms
---
compiler/rustc_builtin_macros/src/format_foreign.rs | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/compiler/rustc_builtin_macros/src/format_foreign.rs b/compiler/rustc_builtin_macros/src/format_foreign.rs
index b39423b86e7b5..ff81b5eca13a7 100644
--- a/compiler/rustc_builtin_macros/src/format_foreign.rs
+++ b/compiler/rustc_builtin_macros/src/format_foreign.rs
@@ -518,8 +518,7 @@ pub mod printf {
.and_then(|end| end.at_next_cp())
.map(|end| (next.slice_between(end).unwrap(), end));
let end = match end {
- Some(("32", end)) => end,
- Some(("64", end)) => end,
+ Some(("32" | "64", end)) => end,
_ => next,
};
state = Type;
From ed97b421059d25a86b2f947734a8ae366b68f473 Mon Sep 17 00:00:00 2001
From: Bastian Kauschke <bastian_kauschke@hotmail.de>
Date: Wed, 23 Sep 2020 13:48:21 +0200
Subject: [PATCH 13/25] add tracking issue
---
library/core/src/array/mod.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/library/core/src/array/mod.rs b/library/core/src/array/mod.rs
index 5730074bf2747..966272ca11549 100644
--- a/library/core/src/array/mod.rs
+++ b/library/core/src/array/mod.rs
@@ -20,14 +20,14 @@ mod iter;
pub use iter::IntoIter;
/// Converts a reference to `T` into a reference to an array of length 1 (without copying).
-#[unstable(feature = "array_from_ref", issue = "none")]
+#[unstable(feature = "array_from_ref", issue = "77101")]
pub fn from_ref<T>(s: &T) -> &[T; 1] {
// SAFETY: Converting `&T` to `&[T; 1]` is sound.
unsafe { &*(s as *const T).cast::<[T; 1]>() }
}
/// Converts a mutable reference to `T` into a mutable reference to an array of length 1 (without copying).
-#[unstable(feature = "array_from_ref", issue = "none")]
+#[unstable(feature = "array_from_ref", issue = "77101")]
pub fn from_mut<T>(s: &mut T) -> &mut [T; 1] {
// SAFETY: Converting `&mut T` to `&mut [T; 1]` is sound.
unsafe { &mut *(s as *mut T).cast::<[T; 1]>() }
From dd66ea2d3d78727eb3d3574f4f6fbe82085d9ee2 Mon Sep 17 00:00:00 2001
From: Erik Hofmayer <ehofmayer@outlook.de>
Date: Wed, 23 Sep 2020 21:14:43 +0200
Subject: [PATCH 14/25] Updated html_root_url for compiler crates
---
compiler/rustc_apfloat/src/lib.rs | 2 +-
compiler/rustc_arena/src/lib.rs | 2 +-
compiler/rustc_ast/src/lib.rs | 2 +-
compiler/rustc_builtin_macros/src/lib.rs | 2 +-
compiler/rustc_codegen_llvm/src/lib.rs | 2 +-
compiler/rustc_codegen_ssa/src/lib.rs | 2 +-
compiler/rustc_data_structures/src/lib.rs | 2 +-
compiler/rustc_driver/src/lib.rs | 2 +-
compiler/rustc_errors/src/lib.rs | 2 +-
compiler/rustc_graphviz/src/lib.rs | 2 +-
compiler/rustc_incremental/src/lib.rs | 2 +-
compiler/rustc_infer/src/lib.rs | 2 +-
compiler/rustc_lint/src/lib.rs | 2 +-
compiler/rustc_llvm/src/lib.rs | 2 +-
compiler/rustc_metadata/src/lib.rs | 2 +-
compiler/rustc_middle/src/lib.rs | 2 +-
compiler/rustc_parse_format/src/lib.rs | 2 +-
compiler/rustc_passes/src/lib.rs | 2 +-
compiler/rustc_plugin_impl/src/lib.rs | 2 +-
compiler/rustc_privacy/src/lib.rs | 2 +-
compiler/rustc_resolve/src/lib.rs | 2 +-
compiler/rustc_save_analysis/src/lib.rs | 2 +-
compiler/rustc_serialize/src/lib.rs | 2 +-
compiler/rustc_span/src/lib.rs | 2 +-
compiler/rustc_symbol_mangling/src/lib.rs | 2 +-
compiler/rustc_target/src/lib.rs | 2 +-
compiler/rustc_trait_selection/src/lib.rs | 2 +-
compiler/rustc_ty/src/lib.rs | 2 +-
compiler/rustc_typeck/src/lib.rs | 2 +-
29 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/compiler/rustc_apfloat/src/lib.rs b/compiler/rustc_apfloat/src/lib.rs
index ba3adc4a135cb..7c96be4f479a1 100644
--- a/compiler/rustc_apfloat/src/lib.rs
+++ b/compiler/rustc_apfloat/src/lib.rs
@@ -30,7 +30,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
#![no_std]
#![forbid(unsafe_code)]
#![feature(nll)]
diff --git a/compiler/rustc_arena/src/lib.rs b/compiler/rustc_arena/src/lib.rs
index 6f9cccf58dd01..86a0fb64f2c73 100644
--- a/compiler/rustc_arena/src/lib.rs
+++ b/compiler/rustc_arena/src/lib.rs
@@ -8,7 +8,7 @@
//! This crate implements several kinds of arena.
#![doc(
- html_root_url = "https://doc.rust-lang.org/nightly/",
+ html_root_url = "https://doc.rust-lang.org/nightly-rustc/",
test(no_crate_inject, attr(deny(warnings)))
)]
#![feature(dropck_eyepatch)]
diff --git a/compiler/rustc_ast/src/lib.rs b/compiler/rustc_ast/src/lib.rs
index 480a5d2f18eca..2072462baa025 100644
--- a/compiler/rustc_ast/src/lib.rs
+++ b/compiler/rustc_ast/src/lib.rs
@@ -4,7 +4,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/", test(attr(deny(warnings))))]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/", test(attr(deny(warnings))))]
#![feature(box_syntax)]
#![feature(const_fn)] // For the `transmute` in `P::new`
#![feature(const_fn_transmute)]
diff --git a/compiler/rustc_builtin_macros/src/lib.rs b/compiler/rustc_builtin_macros/src/lib.rs
index 87be6d1743a2a..6bffad3661567 100644
--- a/compiler/rustc_builtin_macros/src/lib.rs
+++ b/compiler/rustc_builtin_macros/src/lib.rs
@@ -1,7 +1,7 @@
//! This crate contains implementations of built-in macros and other code generating facilities
//! injecting code into the crate before it is lowered to HIR.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
#![feature(bool_to_option)]
#![feature(crate_visibility_modifier)]
#![feature(decl_macro)]
diff --git a/compiler/rustc_codegen_llvm/src/lib.rs b/compiler/rustc_codegen_llvm/src/lib.rs
index 2e2abe9fb30f8..64c58775f49c3 100644
--- a/compiler/rustc_codegen_llvm/src/lib.rs
+++ b/compiler/rustc_codegen_llvm/src/lib.rs
@@ -4,7 +4,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
#![feature(bool_to_option)]
#![feature(const_cstr_unchecked)]
#![feature(crate_visibility_modifier)]
diff --git a/compiler/rustc_codegen_ssa/src/lib.rs b/compiler/rustc_codegen_ssa/src/lib.rs
index a87ce1446ba14..16babec6255e7 100644
--- a/compiler/rustc_codegen_ssa/src/lib.rs
+++ b/compiler/rustc_codegen_ssa/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
#![feature(bool_to_option)]
#![feature(option_expect_none)]
#![feature(box_patterns)]
diff --git a/compiler/rustc_data_structures/src/lib.rs b/compiler/rustc_data_structures/src/lib.rs
index 1f977805f5e90..e037169b252dd 100644
--- a/compiler/rustc_data_structures/src/lib.rs
+++ b/compiler/rustc_data_structures/src/lib.rs
@@ -6,7 +6,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
#![allow(incomplete_features)]
#![feature(array_windows)]
#![feature(control_flow_enum)]
diff --git a/compiler/rustc_driver/src/lib.rs b/compiler/rustc_driver/src/lib.rs
index 972e04fd101f0..5316fedee10ab 100644
--- a/compiler/rustc_driver/src/lib.rs
+++ b/compiler/rustc_driver/src/lib.rs
@@ -4,7 +4,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
#![feature(nll)]
#![feature(once_cell)]
#![recursion_limit = "256"]
diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs
index b16fe5603c100..b221219bedd07 100644
--- a/compiler/rustc_errors/src/lib.rs
+++ b/compiler/rustc_errors/src/lib.rs
@@ -2,7 +2,7 @@
//!
//! This module contains the code for creating and emitting diagnostics.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
#![feature(crate_visibility_modifier)]
#![feature(backtrace)]
#![feature(nll)]
diff --git a/compiler/rustc_graphviz/src/lib.rs b/compiler/rustc_graphviz/src/lib.rs
index 58db81bc1dc61..4bd334e15e118 100644
--- a/compiler/rustc_graphviz/src/lib.rs
+++ b/compiler/rustc_graphviz/src/lib.rs
@@ -272,7 +272,7 @@
//! * [DOT language](http://www.graphviz.org/doc/info/lang.html)
#![doc(
- html_root_url = "https://doc.rust-lang.org/nightly/",
+ html_root_url = "https://doc.rust-lang.org/nightly-rustc/",
test(attr(allow(unused_variables), deny(warnings)))
)]
#![feature(nll)]
diff --git a/compiler/rustc_incremental/src/lib.rs b/compiler/rustc_incremental/src/lib.rs
index ad18913805467..bcd700e5ac1e6 100644
--- a/compiler/rustc_incremental/src/lib.rs
+++ b/compiler/rustc_incremental/src/lib.rs
@@ -1,6 +1,6 @@
//! Support for serializing the dep-graph and reloading it.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
#![feature(in_band_lifetimes)]
#![feature(nll)]
#![recursion_limit = "256"]
diff --git a/compiler/rustc_infer/src/lib.rs b/compiler/rustc_infer/src/lib.rs
index 504b66bae7329..99bec24b86844 100644
--- a/compiler/rustc_infer/src/lib.rs
+++ b/compiler/rustc_infer/src/lib.rs
@@ -12,7 +12,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
#![feature(bool_to_option)]
#![feature(box_patterns)]
#![feature(box_syntax)]
diff --git a/compiler/rustc_lint/src/lib.rs b/compiler/rustc_lint/src/lib.rs
index b48592c103ca2..c4832aa85e46a 100644
--- a/compiler/rustc_lint/src/lib.rs
+++ b/compiler/rustc_lint/src/lib.rs
@@ -25,7 +25,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
#![cfg_attr(test, feature(test))]
#![feature(array_windows)]
#![feature(bool_to_option)]
diff --git a/compiler/rustc_llvm/src/lib.rs b/compiler/rustc_llvm/src/lib.rs
index 9d23397ade08e..dfcb6d04b6fab 100644
--- a/compiler/rustc_llvm/src/lib.rs
+++ b/compiler/rustc_llvm/src/lib.rs
@@ -1,6 +1,6 @@
#![feature(nll)]
#![feature(static_nobundle)]
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
// NOTE: This crate only exists to allow linking on mingw targets.
diff --git a/compiler/rustc_metadata/src/lib.rs b/compiler/rustc_metadata/src/lib.rs
index 85490f5f6e91a..4011521d23739 100644
--- a/compiler/rustc_metadata/src/lib.rs
+++ b/compiler/rustc_metadata/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
#![feature(bool_to_option)]
#![feature(core_intrinsics)]
#![feature(crate_visibility_modifier)]
diff --git a/compiler/rustc_middle/src/lib.rs b/compiler/rustc_middle/src/lib.rs
index 74cb3c130b7f0..86ceaca9b044b 100644
--- a/compiler/rustc_middle/src/lib.rs
+++ b/compiler/rustc_middle/src/lib.rs
@@ -22,7 +22,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
#![feature(array_windows)]
#![feature(backtrace)]
#![feature(bool_to_option)]
diff --git a/compiler/rustc_parse_format/src/lib.rs b/compiler/rustc_parse_format/src/lib.rs
index cef632b1d8f03..a0d64107c9185 100644
--- a/compiler/rustc_parse_format/src/lib.rs
+++ b/compiler/rustc_parse_format/src/lib.rs
@@ -5,7 +5,7 @@
//! generated instead.
#![doc(
- html_root_url = "https://doc.rust-lang.org/nightly/",
+ html_root_url = "https://doc.rust-lang.org/nightly-rustc/",
html_playground_url = "https://play.rust-lang.org/",
test(attr(deny(warnings)))
)]
diff --git a/compiler/rustc_passes/src/lib.rs b/compiler/rustc_passes/src/lib.rs
index be4c542ec3a1d..08e152cf5ee39 100644
--- a/compiler/rustc_passes/src/lib.rs
+++ b/compiler/rustc_passes/src/lib.rs
@@ -4,7 +4,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
#![feature(in_band_lifetimes)]
#![feature(nll)]
#![feature(or_patterns)]
diff --git a/compiler/rustc_plugin_impl/src/lib.rs b/compiler/rustc_plugin_impl/src/lib.rs
index 1eb65dd96ba57..efa2f6e96f948 100644
--- a/compiler/rustc_plugin_impl/src/lib.rs
+++ b/compiler/rustc_plugin_impl/src/lib.rs
@@ -6,7 +6,7 @@
//! feature](https://doc.rust-lang.org/nightly/unstable-book/language-features/plugin.html)
//! of the Unstable Book for some examples.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
#![feature(nll)]
#![recursion_limit = "256"]
diff --git a/compiler/rustc_privacy/src/lib.rs b/compiler/rustc_privacy/src/lib.rs
index c2de4cdbf0dd5..0b45d7792604c 100644
--- a/compiler/rustc_privacy/src/lib.rs
+++ b/compiler/rustc_privacy/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
#![feature(in_band_lifetimes)]
#![feature(nll)]
#![recursion_limit = "256"]
diff --git a/compiler/rustc_resolve/src/lib.rs b/compiler/rustc_resolve/src/lib.rs
index 677cf27cde71c..a34572e7f36fa 100644
--- a/compiler/rustc_resolve/src/lib.rs
+++ b/compiler/rustc_resolve/src/lib.rs
@@ -8,7 +8,7 @@
//!
//! Type-relative name resolution (methods, fields, associated items) happens in `librustc_typeck`.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
#![feature(bool_to_option)]
#![feature(crate_visibility_modifier)]
#![feature(nll)]
diff --git a/compiler/rustc_save_analysis/src/lib.rs b/compiler/rustc_save_analysis/src/lib.rs
index 032d7cb3ed6b7..af001594b20d2 100644
--- a/compiler/rustc_save_analysis/src/lib.rs
+++ b/compiler/rustc_save_analysis/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
#![feature(nll)]
#![feature(or_patterns)]
#![recursion_limit = "256"]
diff --git a/compiler/rustc_serialize/src/lib.rs b/compiler/rustc_serialize/src/lib.rs
index 265b3b95e956a..fa6f5ab3db62a 100644
--- a/compiler/rustc_serialize/src/lib.rs
+++ b/compiler/rustc_serialize/src/lib.rs
@@ -5,7 +5,7 @@ Core encoding and decoding interfaces.
*/
#![doc(
- html_root_url = "https://doc.rust-lang.org/nightly/",
+ html_root_url = "https://doc.rust-lang.org/nightly-rustc/",
html_playground_url = "https://play.rust-lang.org/",
test(attr(allow(unused_variables), deny(warnings)))
)]
diff --git a/compiler/rustc_span/src/lib.rs b/compiler/rustc_span/src/lib.rs
index 4b02a2d4076d7..20b2eff8555db 100644
--- a/compiler/rustc_span/src/lib.rs
+++ b/compiler/rustc_span/src/lib.rs
@@ -4,7 +4,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
#![feature(array_windows)]
#![feature(crate_visibility_modifier)]
#![feature(const_fn)]
diff --git a/compiler/rustc_symbol_mangling/src/lib.rs b/compiler/rustc_symbol_mangling/src/lib.rs
index 296b40c4e395d..c15cb4bf6c5ed 100644
--- a/compiler/rustc_symbol_mangling/src/lib.rs
+++ b/compiler/rustc_symbol_mangling/src/lib.rs
@@ -87,7 +87,7 @@
//! virtually impossible. Thus, symbol hash generation exclusively relies on
//! DefPaths which are much more robust in the face of changes to the code base.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
#![feature(never_type)]
#![feature(nll)]
#![feature(or_patterns)]
diff --git a/compiler/rustc_target/src/lib.rs b/compiler/rustc_target/src/lib.rs
index 5788e1e838598..eacc1d0c23d17 100644
--- a/compiler/rustc_target/src/lib.rs
+++ b/compiler/rustc_target/src/lib.rs
@@ -7,7 +7,7 @@
//! more 'stuff' here in the future. It does not have a dependency on
//! LLVM.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
#![feature(bool_to_option)]
#![feature(const_fn)]
#![feature(const_panic)]
diff --git a/compiler/rustc_trait_selection/src/lib.rs b/compiler/rustc_trait_selection/src/lib.rs
index da1996b92a60b..b9e300a3ec1a1 100644
--- a/compiler/rustc_trait_selection/src/lib.rs
+++ b/compiler/rustc_trait_selection/src/lib.rs
@@ -10,7 +10,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
#![feature(bool_to_option)]
#![feature(box_patterns)]
#![feature(drain_filter)]
diff --git a/compiler/rustc_ty/src/lib.rs b/compiler/rustc_ty/src/lib.rs
index 8dd6aa3c7fcc1..9f6a310033b7b 100644
--- a/compiler/rustc_ty/src/lib.rs
+++ b/compiler/rustc_ty/src/lib.rs
@@ -4,7 +4,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
#![feature(nll)]
#![recursion_limit = "256"]
diff --git a/compiler/rustc_typeck/src/lib.rs b/compiler/rustc_typeck/src/lib.rs
index 0e9f4476c2075..7ee62c77dbfb8 100644
--- a/compiler/rustc_typeck/src/lib.rs
+++ b/compiler/rustc_typeck/src/lib.rs
@@ -55,7 +55,7 @@ This API is completely unstable and subject to change.
*/
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
#![allow(non_camel_case_types)]
#![feature(bool_to_option)]
#![feature(box_syntax)]
From 947536fca06e6dc6c3a3dd4ff1f66fc5080e9cbb Mon Sep 17 00:00:00 2001
From: Christiaan Dirkx <christiaan@dirkx.email>
Date: Mon, 7 Sep 2020 17:43:48 +0200
Subject: [PATCH 15/25] Make delegation methods of `std::net::IpAddr` unstable
const
Make the following methods of `std::net::IpAddr` unstable const under the `const_ip` feature:
- `is_unspecified`
- `is_loopback`
- `is_global`
- `is_multicast`
Also adds a test for these methods in a const context.
Possible because these methods delegate to the inner `Ipv4Addr` or `Ipv6Addr`, which were made const, and the recent stabilization of const control flow.
Part of #76205
---
library/std/src/lib.rs | 1 +
library/std/src/net/ip.rs | 15 ++++++++++-----
library/std/src/net/ip/tests.rs | 19 +++++++++++++++++++
3 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
index 309657e70424b..ac0075ad129c5 100644
--- a/library/std/src/lib.rs
+++ b/library/std/src/lib.rs
@@ -238,6 +238,7 @@
#![feature(const_cstr_unchecked)]
#![feature(const_fn_transmute)]
#![feature(const_fn)]
+#![feature(const_ip)]
#![feature(const_ipv6)]
#![feature(const_raw_ptr_deref)]
#![feature(const_ipv4)]
diff --git a/library/std/src/net/ip.rs b/library/std/src/net/ip.rs
index e2fc7edb87e2c..f01a7b72a6559 100644
--- a/library/std/src/net/ip.rs
+++ b/library/std/src/net/ip.rs
@@ -148,8 +148,9 @@ impl IpAddr {
/// assert_eq!(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)).is_unspecified(), true);
/// assert_eq!(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 0)).is_unspecified(), true);
/// ```
+ #[rustc_const_unstable(feature = "const_ip", issue = "76205")]
#[stable(feature = "ip_shared", since = "1.12.0")]
- pub fn is_unspecified(&self) -> bool {
+ pub const fn is_unspecified(&self) -> bool {
match self {
IpAddr::V4(ip) => ip.is_unspecified(),
IpAddr::V6(ip) => ip.is_unspecified(),
@@ -169,8 +170,9 @@ impl IpAddr {
/// assert_eq!(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)).is_loopback(), true);
/// assert_eq!(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 0x1)).is_loopback(), true);
/// ```
+ #[rustc_const_unstable(feature = "const_ip", issue = "76205")]
#[stable(feature = "ip_shared", since = "1.12.0")]
- pub fn is_loopback(&self) -> bool {
+ pub const fn is_loopback(&self) -> bool {
match self {
IpAddr::V4(ip) => ip.is_loopback(),
IpAddr::V6(ip) => ip.is_loopback(),
@@ -192,7 +194,8 @@ impl IpAddr {
/// assert_eq!(IpAddr::V4(Ipv4Addr::new(80, 9, 12, 3)).is_global(), true);
/// assert_eq!(IpAddr::V6(Ipv6Addr::new(0, 0, 0x1c9, 0, 0, 0xafc8, 0, 0x1)).is_global(), true);
/// ```
- pub fn is_global(&self) -> bool {
+ #[rustc_const_unstable(feature = "const_ip", issue = "76205")]
+ pub const fn is_global(&self) -> bool {
match self {
IpAddr::V4(ip) => ip.is_global(),
IpAddr::V6(ip) => ip.is_global(),
@@ -212,8 +215,9 @@ impl IpAddr {
/// assert_eq!(IpAddr::V4(Ipv4Addr::new(224, 254, 0, 0)).is_multicast(), true);
/// assert_eq!(IpAddr::V6(Ipv6Addr::new(0xff00, 0, 0, 0, 0, 0, 0, 0)).is_multicast(), true);
/// ```
+ #[rustc_const_unstable(feature = "const_ip", issue = "76205")]
#[stable(feature = "ip_shared", since = "1.12.0")]
- pub fn is_multicast(&self) -> bool {
+ pub const fn is_multicast(&self) -> bool {
match self {
IpAddr::V4(ip) => ip.is_multicast(),
IpAddr::V6(ip) => ip.is_multicast(),
@@ -238,7 +242,8 @@ impl IpAddr {
/// true
/// );
/// ```
- pub fn is_documentation(&self) -> bool {
+ #[rustc_const_unstable(feature = "const_ip", issue = "76205")]
+ pub const fn is_documentation(&self) -> bool {
match self {
IpAddr::V4(ip) => ip.is_documentation(),
IpAddr::V6(ip) => ip.is_documentation(),
diff --git a/library/std/src/net/ip/tests.rs b/library/std/src/net/ip/tests.rs
index 76a0ae8b9454d..d9fbdd1b5e794 100644
--- a/library/std/src/net/ip/tests.rs
+++ b/library/std/src/net/ip/tests.rs
@@ -918,3 +918,22 @@ fn ipv6_const() {
const IP_V4: Option<Ipv4Addr> = IP_ADDRESS.to_ipv4();
assert_eq!(IP_V4.unwrap(), Ipv4Addr::new(0, 0, 0, 1));
}
+
+#[test]
+fn ip_const() {
+ // test that the methods of `IpAddr` are usable in a const context
+
+ const IP_ADDRESS: IpAddr = IpAddr::V4(Ipv4Addr::LOCALHOST);
+
+ const IS_UNSPECIFIED: bool = IP_ADDRESS.is_unspecified();
+ assert!(!IS_UNSPECIFIED);
+
+ const IS_LOOPBACK: bool = IP_ADDRESS.is_loopback();
+ assert!(IS_LOOPBACK);
+
+ const IS_GLOBAL: bool = IP_ADDRESS.is_global();
+ assert!(!IS_GLOBAL);
+
+ const IS_MULTICAST: bool = IP_ADDRESS.is_multicast();
+ assert!(!IS_MULTICAST);
+}
From 138a2e5eaaafeee8b981045857f9df18ef4689d5 Mon Sep 17 00:00:00 2001
From: Erik Hofmayer <ehofmayer@outlook.de>
Date: Wed, 23 Sep 2020 21:51:56 +0200
Subject: [PATCH 16/25] /nightly/nightly-rustc
---
compiler/rustc_apfloat/src/lib.rs | 2 +-
compiler/rustc_arena/src/lib.rs | 2 +-
compiler/rustc_ast/src/lib.rs | 2 +-
compiler/rustc_builtin_macros/src/lib.rs | 2 +-
compiler/rustc_codegen_llvm/src/lib.rs | 2 +-
compiler/rustc_codegen_ssa/src/lib.rs | 2 +-
compiler/rustc_data_structures/src/lib.rs | 2 +-
compiler/rustc_driver/src/lib.rs | 2 +-
compiler/rustc_errors/src/lib.rs | 2 +-
compiler/rustc_graphviz/src/lib.rs | 2 +-
compiler/rustc_incremental/src/lib.rs | 2 +-
compiler/rustc_infer/src/lib.rs | 2 +-
compiler/rustc_lint/src/lib.rs | 2 +-
compiler/rustc_llvm/src/lib.rs | 2 +-
compiler/rustc_metadata/src/lib.rs | 2 +-
compiler/rustc_middle/src/lib.rs | 2 +-
compiler/rustc_parse_format/src/lib.rs | 2 +-
compiler/rustc_passes/src/lib.rs | 2 +-
compiler/rustc_plugin_impl/src/lib.rs | 2 +-
compiler/rustc_privacy/src/lib.rs | 2 +-
compiler/rustc_resolve/src/lib.rs | 2 +-
compiler/rustc_save_analysis/src/lib.rs | 2 +-
compiler/rustc_serialize/src/lib.rs | 2 +-
compiler/rustc_span/src/lib.rs | 2 +-
compiler/rustc_symbol_mangling/src/lib.rs | 2 +-
compiler/rustc_target/src/lib.rs | 2 +-
compiler/rustc_trait_selection/src/lib.rs | 2 +-
compiler/rustc_ty/src/lib.rs | 2 +-
compiler/rustc_typeck/src/lib.rs | 2 +-
29 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/compiler/rustc_apfloat/src/lib.rs b/compiler/rustc_apfloat/src/lib.rs
index 7c96be4f479a1..4a845fcb6917b 100644
--- a/compiler/rustc_apfloat/src/lib.rs
+++ b/compiler/rustc_apfloat/src/lib.rs
@@ -30,7 +30,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![no_std]
#![forbid(unsafe_code)]
#![feature(nll)]
diff --git a/compiler/rustc_arena/src/lib.rs b/compiler/rustc_arena/src/lib.rs
index 86a0fb64f2c73..152f0f1ab2a6f 100644
--- a/compiler/rustc_arena/src/lib.rs
+++ b/compiler/rustc_arena/src/lib.rs
@@ -8,7 +8,7 @@
//! This crate implements several kinds of arena.
#![doc(
- html_root_url = "https://doc.rust-lang.org/nightly-rustc/",
+ html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/",
test(no_crate_inject, attr(deny(warnings)))
)]
#![feature(dropck_eyepatch)]
diff --git a/compiler/rustc_ast/src/lib.rs b/compiler/rustc_ast/src/lib.rs
index 2072462baa025..765a21fd93e1b 100644
--- a/compiler/rustc_ast/src/lib.rs
+++ b/compiler/rustc_ast/src/lib.rs
@@ -4,7 +4,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/", test(attr(deny(warnings))))]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/", test(attr(deny(warnings))))]
#![feature(box_syntax)]
#![feature(const_fn)] // For the `transmute` in `P::new`
#![feature(const_fn_transmute)]
diff --git a/compiler/rustc_builtin_macros/src/lib.rs b/compiler/rustc_builtin_macros/src/lib.rs
index 6bffad3661567..97cadb913cacf 100644
--- a/compiler/rustc_builtin_macros/src/lib.rs
+++ b/compiler/rustc_builtin_macros/src/lib.rs
@@ -1,7 +1,7 @@
//! This crate contains implementations of built-in macros and other code generating facilities
//! injecting code into the crate before it is lowered to HIR.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(bool_to_option)]
#![feature(crate_visibility_modifier)]
#![feature(decl_macro)]
diff --git a/compiler/rustc_codegen_llvm/src/lib.rs b/compiler/rustc_codegen_llvm/src/lib.rs
index 64c58775f49c3..456e9c7ce75fa 100644
--- a/compiler/rustc_codegen_llvm/src/lib.rs
+++ b/compiler/rustc_codegen_llvm/src/lib.rs
@@ -4,7 +4,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(bool_to_option)]
#![feature(const_cstr_unchecked)]
#![feature(crate_visibility_modifier)]
diff --git a/compiler/rustc_codegen_ssa/src/lib.rs b/compiler/rustc_codegen_ssa/src/lib.rs
index 16babec6255e7..8568bd64f4c4f 100644
--- a/compiler/rustc_codegen_ssa/src/lib.rs
+++ b/compiler/rustc_codegen_ssa/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(bool_to_option)]
#![feature(option_expect_none)]
#![feature(box_patterns)]
diff --git a/compiler/rustc_data_structures/src/lib.rs b/compiler/rustc_data_structures/src/lib.rs
index e037169b252dd..b0b7f9058f973 100644
--- a/compiler/rustc_data_structures/src/lib.rs
+++ b/compiler/rustc_data_structures/src/lib.rs
@@ -6,7 +6,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![allow(incomplete_features)]
#![feature(array_windows)]
#![feature(control_flow_enum)]
diff --git a/compiler/rustc_driver/src/lib.rs b/compiler/rustc_driver/src/lib.rs
index 5316fedee10ab..7118437c0c850 100644
--- a/compiler/rustc_driver/src/lib.rs
+++ b/compiler/rustc_driver/src/lib.rs
@@ -4,7 +4,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(nll)]
#![feature(once_cell)]
#![recursion_limit = "256"]
diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs
index b221219bedd07..2e8a4ef327ac4 100644
--- a/compiler/rustc_errors/src/lib.rs
+++ b/compiler/rustc_errors/src/lib.rs
@@ -2,7 +2,7 @@
//!
//! This module contains the code for creating and emitting diagnostics.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(crate_visibility_modifier)]
#![feature(backtrace)]
#![feature(nll)]
diff --git a/compiler/rustc_graphviz/src/lib.rs b/compiler/rustc_graphviz/src/lib.rs
index 4bd334e15e118..76e33bed97f27 100644
--- a/compiler/rustc_graphviz/src/lib.rs
+++ b/compiler/rustc_graphviz/src/lib.rs
@@ -272,7 +272,7 @@
//! * [DOT language](http://www.graphviz.org/doc/info/lang.html)
#![doc(
- html_root_url = "https://doc.rust-lang.org/nightly-rustc/",
+ html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/",
test(attr(allow(unused_variables), deny(warnings)))
)]
#![feature(nll)]
diff --git a/compiler/rustc_incremental/src/lib.rs b/compiler/rustc_incremental/src/lib.rs
index bcd700e5ac1e6..a80c4be3e9335 100644
--- a/compiler/rustc_incremental/src/lib.rs
+++ b/compiler/rustc_incremental/src/lib.rs
@@ -1,6 +1,6 @@
//! Support for serializing the dep-graph and reloading it.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(in_band_lifetimes)]
#![feature(nll)]
#![recursion_limit = "256"]
diff --git a/compiler/rustc_infer/src/lib.rs b/compiler/rustc_infer/src/lib.rs
index 99bec24b86844..ea9a46613484a 100644
--- a/compiler/rustc_infer/src/lib.rs
+++ b/compiler/rustc_infer/src/lib.rs
@@ -12,7 +12,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(bool_to_option)]
#![feature(box_patterns)]
#![feature(box_syntax)]
diff --git a/compiler/rustc_lint/src/lib.rs b/compiler/rustc_lint/src/lib.rs
index c4832aa85e46a..7f7472d9283b8 100644
--- a/compiler/rustc_lint/src/lib.rs
+++ b/compiler/rustc_lint/src/lib.rs
@@ -25,7 +25,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![cfg_attr(test, feature(test))]
#![feature(array_windows)]
#![feature(bool_to_option)]
diff --git a/compiler/rustc_llvm/src/lib.rs b/compiler/rustc_llvm/src/lib.rs
index dfcb6d04b6fab..a7a10b91b4eca 100644
--- a/compiler/rustc_llvm/src/lib.rs
+++ b/compiler/rustc_llvm/src/lib.rs
@@ -1,6 +1,6 @@
#![feature(nll)]
#![feature(static_nobundle)]
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
// NOTE: This crate only exists to allow linking on mingw targets.
diff --git a/compiler/rustc_metadata/src/lib.rs b/compiler/rustc_metadata/src/lib.rs
index 4011521d23739..77766be7397c7 100644
--- a/compiler/rustc_metadata/src/lib.rs
+++ b/compiler/rustc_metadata/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(bool_to_option)]
#![feature(core_intrinsics)]
#![feature(crate_visibility_modifier)]
diff --git a/compiler/rustc_middle/src/lib.rs b/compiler/rustc_middle/src/lib.rs
index 86ceaca9b044b..fa885ce2e7cdf 100644
--- a/compiler/rustc_middle/src/lib.rs
+++ b/compiler/rustc_middle/src/lib.rs
@@ -22,7 +22,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(array_windows)]
#![feature(backtrace)]
#![feature(bool_to_option)]
diff --git a/compiler/rustc_parse_format/src/lib.rs b/compiler/rustc_parse_format/src/lib.rs
index a0d64107c9185..25e3e67e28e6c 100644
--- a/compiler/rustc_parse_format/src/lib.rs
+++ b/compiler/rustc_parse_format/src/lib.rs
@@ -5,7 +5,7 @@
//! generated instead.
#![doc(
- html_root_url = "https://doc.rust-lang.org/nightly-rustc/",
+ html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/",
html_playground_url = "https://play.rust-lang.org/",
test(attr(deny(warnings)))
)]
diff --git a/compiler/rustc_passes/src/lib.rs b/compiler/rustc_passes/src/lib.rs
index 08e152cf5ee39..c14d6aace87e0 100644
--- a/compiler/rustc_passes/src/lib.rs
+++ b/compiler/rustc_passes/src/lib.rs
@@ -4,7 +4,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(in_band_lifetimes)]
#![feature(nll)]
#![feature(or_patterns)]
diff --git a/compiler/rustc_plugin_impl/src/lib.rs b/compiler/rustc_plugin_impl/src/lib.rs
index efa2f6e96f948..5bf4d300e9e54 100644
--- a/compiler/rustc_plugin_impl/src/lib.rs
+++ b/compiler/rustc_plugin_impl/src/lib.rs
@@ -6,7 +6,7 @@
//! feature](https://doc.rust-lang.org/nightly/unstable-book/language-features/plugin.html)
//! of the Unstable Book for some examples.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(nll)]
#![recursion_limit = "256"]
diff --git a/compiler/rustc_privacy/src/lib.rs b/compiler/rustc_privacy/src/lib.rs
index 0b45d7792604c..8d1b826ea3595 100644
--- a/compiler/rustc_privacy/src/lib.rs
+++ b/compiler/rustc_privacy/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(in_band_lifetimes)]
#![feature(nll)]
#![recursion_limit = "256"]
diff --git a/compiler/rustc_resolve/src/lib.rs b/compiler/rustc_resolve/src/lib.rs
index a34572e7f36fa..283db1404d0a4 100644
--- a/compiler/rustc_resolve/src/lib.rs
+++ b/compiler/rustc_resolve/src/lib.rs
@@ -8,7 +8,7 @@
//!
//! Type-relative name resolution (methods, fields, associated items) happens in `librustc_typeck`.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(bool_to_option)]
#![feature(crate_visibility_modifier)]
#![feature(nll)]
diff --git a/compiler/rustc_save_analysis/src/lib.rs b/compiler/rustc_save_analysis/src/lib.rs
index af001594b20d2..f6434689fec01 100644
--- a/compiler/rustc_save_analysis/src/lib.rs
+++ b/compiler/rustc_save_analysis/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(nll)]
#![feature(or_patterns)]
#![recursion_limit = "256"]
diff --git a/compiler/rustc_serialize/src/lib.rs b/compiler/rustc_serialize/src/lib.rs
index fa6f5ab3db62a..ed48fbf40ac1f 100644
--- a/compiler/rustc_serialize/src/lib.rs
+++ b/compiler/rustc_serialize/src/lib.rs
@@ -5,7 +5,7 @@ Core encoding and decoding interfaces.
*/
#![doc(
- html_root_url = "https://doc.rust-lang.org/nightly-rustc/",
+ html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/",
html_playground_url = "https://play.rust-lang.org/",
test(attr(allow(unused_variables), deny(warnings)))
)]
diff --git a/compiler/rustc_span/src/lib.rs b/compiler/rustc_span/src/lib.rs
index 20b2eff8555db..96a6956a40c54 100644
--- a/compiler/rustc_span/src/lib.rs
+++ b/compiler/rustc_span/src/lib.rs
@@ -4,7 +4,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(array_windows)]
#![feature(crate_visibility_modifier)]
#![feature(const_fn)]
diff --git a/compiler/rustc_symbol_mangling/src/lib.rs b/compiler/rustc_symbol_mangling/src/lib.rs
index c15cb4bf6c5ed..75150a56c43be 100644
--- a/compiler/rustc_symbol_mangling/src/lib.rs
+++ b/compiler/rustc_symbol_mangling/src/lib.rs
@@ -87,7 +87,7 @@
//! virtually impossible. Thus, symbol hash generation exclusively relies on
//! DefPaths which are much more robust in the face of changes to the code base.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(never_type)]
#![feature(nll)]
#![feature(or_patterns)]
diff --git a/compiler/rustc_target/src/lib.rs b/compiler/rustc_target/src/lib.rs
index eacc1d0c23d17..fb747dfcbd337 100644
--- a/compiler/rustc_target/src/lib.rs
+++ b/compiler/rustc_target/src/lib.rs
@@ -7,7 +7,7 @@
//! more 'stuff' here in the future. It does not have a dependency on
//! LLVM.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(bool_to_option)]
#![feature(const_fn)]
#![feature(const_panic)]
diff --git a/compiler/rustc_trait_selection/src/lib.rs b/compiler/rustc_trait_selection/src/lib.rs
index b9e300a3ec1a1..caf0325084c09 100644
--- a/compiler/rustc_trait_selection/src/lib.rs
+++ b/compiler/rustc_trait_selection/src/lib.rs
@@ -10,7 +10,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(bool_to_option)]
#![feature(box_patterns)]
#![feature(drain_filter)]
diff --git a/compiler/rustc_ty/src/lib.rs b/compiler/rustc_ty/src/lib.rs
index 9f6a310033b7b..904c0062a926f 100644
--- a/compiler/rustc_ty/src/lib.rs
+++ b/compiler/rustc_ty/src/lib.rs
@@ -4,7 +4,7 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(nll)]
#![recursion_limit = "256"]
diff --git a/compiler/rustc_typeck/src/lib.rs b/compiler/rustc_typeck/src/lib.rs
index 7ee62c77dbfb8..84efb92582ed2 100644
--- a/compiler/rustc_typeck/src/lib.rs
+++ b/compiler/rustc_typeck/src/lib.rs
@@ -55,7 +55,7 @@ This API is completely unstable and subject to change.
*/
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly-rustc/")]
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![allow(non_camel_case_types)]
#![feature(bool_to_option)]
#![feature(box_syntax)]
From 5b3016134fef93d9bed343bb15da837acf50b635 Mon Sep 17 00:00:00 2001
From: Bastian Kauschke <bastian_kauschke@hotmail.de>
Date: Wed, 23 Sep 2020 21:33:45 +0200
Subject: [PATCH 17/25] use array::from_ref for slices
---
library/core/src/slice/raw.rs | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/library/core/src/slice/raw.rs b/library/core/src/slice/raw.rs
index a5811c5e47289..09209306c9d0f 100644
--- a/library/core/src/slice/raw.rs
+++ b/library/core/src/slice/raw.rs
@@ -1,5 +1,6 @@
//! Free functions to create `&[T]` and `&mut [T]`.
+use crate::array;
use crate::intrinsics::is_aligned_and_not_null;
use crate::mem;
use crate::ptr;
@@ -140,19 +141,11 @@ pub unsafe fn from_raw_parts_mut<'a, T>(data: *mut T, len: usize) -> &'a mut [T]
/// Converts a reference to T into a slice of length 1 (without copying).
#[stable(feature = "from_ref", since = "1.28.0")]
pub fn from_ref<T>(s: &T) -> &[T] {
- // SAFETY: a reference is guaranteed to be valid for reads. The returned
- // reference cannot be mutated as it is an immutable reference.
- // `mem::size_of::<T>()` cannot be larger than `isize::MAX`.
- // Thus the call to `from_raw_parts` is safe.
- unsafe { from_raw_parts(s, 1) }
+ array::from_ref(s)
}
/// Converts a reference to T into a slice of length 1 (without copying).
#[stable(feature = "from_ref", since = "1.28.0")]
pub fn from_mut<T>(s: &mut T) -> &mut [T] {
- // SAFETY: a mutable reference is guaranteed to be valid for writes.
- // The reference cannot be accessed by another pointer as it is an mutable reference.
- // `mem::size_of::<T>()` cannot be larger than `isize::MAX`.
- // Thus the call to `from_raw_parts_mut` is safe.
- unsafe { from_raw_parts_mut(s, 1) }
+ array::from_mut(s)
}
From 764967a7e5cd260db94395614399e2638bee1eda Mon Sep 17 00:00:00 2001
From: Erik Hofmayer <ehofmayer@outlook.de>
Date: Wed, 23 Sep 2020 22:08:30 +0200
Subject: [PATCH 18/25] tidy
---
compiler/rustc_ast/src/lib.rs | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/compiler/rustc_ast/src/lib.rs b/compiler/rustc_ast/src/lib.rs
index 765a21fd93e1b..6e47ff7d74081 100644
--- a/compiler/rustc_ast/src/lib.rs
+++ b/compiler/rustc_ast/src/lib.rs
@@ -4,7 +4,10 @@
//!
//! This API is completely unstable and subject to change.
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/", test(attr(deny(warnings))))]
+#![doc(
+ html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/",
+ test(attr(deny(warnings)))
+)]
#![feature(box_syntax)]
#![feature(const_fn)] // For the `transmute` in `P::new`
#![feature(const_fn_transmute)]
From 085679c8414fbcd0a832d57134eb6832ea7a1020 Mon Sep 17 00:00:00 2001
From: Jarek Samic <cldfire3@gmail.com>
Date: Wed, 23 Sep 2020 21:31:27 -0400
Subject: [PATCH 19/25] Use theme-adaptive SVG favicon from other Rust sites
---
src/librustdoc/html/layout.rs | 4 +++-
src/librustdoc/html/render/mod.rs | 4 +++-
src/librustdoc/html/static/favicon-16x16.png | Bin 0 -> 2214 bytes
src/librustdoc/html/static/favicon-32x32.png | Bin 0 -> 2919 bytes
src/librustdoc/html/static/favicon.ico | Bin 23229 -> 0 bytes
src/librustdoc/html/static/favicon.svg | 24 +++++++++++++++++++
src/librustdoc/html/static_files.rs | 6 +++--
7 files changed, 34 insertions(+), 4 deletions(-)
create mode 100644 src/librustdoc/html/static/favicon-16x16.png
create mode 100644 src/librustdoc/html/static/favicon-32x32.png
delete mode 100644 src/librustdoc/html/static/favicon.ico
create mode 100644 src/librustdoc/html/static/favicon.svg
diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs
index 287c85b8c2253..7239b3c5ba2f6 100644
--- a/src/librustdoc/html/layout.rs
+++ b/src/librustdoc/html/layout.rs
@@ -158,7 +158,9 @@ pub fn render<T: Print, S: Print>(
keywords = page.keywords,
favicon = if layout.favicon.is_empty() {
format!(
- r#"<link rel="shortcut icon" href="{static_root_path}favicon{suffix}.ico">"#,
+ r##"<link rel="icon" type="image/svg+xml" href="{static_root_path}favicon{suffix}.svg">
+<link rel="alternate icon" type="image/png" href="{static_root_path}favicon-16x16{suffix}.png">
+<link rel="alternate icon" type="image/png" href="{static_root_path}favicon-32x32{suffix}.png">"##,
static_root_path = static_root_path,
suffix = page.resource_suffix
)
diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs
index f095f67b54c63..8b5ba7a239c5f 100644
--- a/src/librustdoc/html/render/mod.rs
+++ b/src/librustdoc/html/render/mod.rs
@@ -754,7 +754,9 @@ fn write_shared(
write(cx.path("rust-logo.png"), static_files::RUST_LOGO)?;
}
if (*cx.shared).layout.favicon.is_empty() {
- write(cx.path("favicon.ico"), static_files::RUST_FAVICON)?;
+ write(cx.path("favicon.svg"), static_files::RUST_FAVICON_SVG)?;
+ write(cx.path("favicon-16x16.png"), static_files::RUST_FAVICON_PNG_16)?;
+ write(cx.path("favicon-32x32.png"), static_files::RUST_FAVICON_PNG_32)?;
}
write(cx.path("brush.svg"), static_files::BRUSH_SVG)?;
write(cx.path("wheel.svg"), static_files::WHEEL_SVG)?;
diff --git a/src/librustdoc/html/static/favicon-16x16.png b/src/librustdoc/html/static/favicon-16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..7cfe6c13550d31bc31355616bbb9cb77fd1b25ef
GIT binary patch
literal 2214
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
Yn%3fx<aCE5*uNL@s5n_=<f1qJ0sSgV^8f$<
literal 0
HcmV?d00001
diff --git a/src/librustdoc/html/static/favicon-32x32.png b/src/librustdoc/html/static/favicon-32x32.png
new file mode 100644
index 0000000000000000000000000000000000000000..5109c1de8bea744180448b347fb44ddef23b90f4
GIT binary patch
literal 2919
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
IIpoLx0#^I3DgXcg
literal 0
HcmV?d00001
diff --git a/src/librustdoc/html/static/favicon.ico b/src/librustdoc/html/static/favicon.ico
deleted file mode 100644
index b8ad23769ac8d06eb5973bfb3d2acbf385240f98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 23229
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
IAL#r40Ahn8xc~qF
diff --git a/src/librustdoc/html/static/favicon.svg b/src/librustdoc/html/static/favicon.svg
new file mode 100644
index 0000000000000..8b34b511989e1
--- /dev/null
+++ b/src/librustdoc/html/static/favicon.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;">
+<defs>
+ <style type="text/css"><![CDATA[
+ #logo {
+ fill-rule: nonzero;
+ }
+ #logo-teeth {
+ stroke: #000000;
+ stroke-width: 0.92px;
+ }
+ @media (prefers-color-scheme: dark) {
+ #logo {
+ fill: #FFFFFF;
+ fill-rule: nonzero;
+ }
+ #logo-teeth {
+ fill: #FFFFFF;
+ stroke: #FFFFFF;
+ stroke-width: 0.92px;
+ }
+ }
+ ]]></style>
+</defs>
+<path id="logo" d="M15.993,1.54c-7.972,0 -14.461,6.492 -14.461,14.462c0,7.969 6.492,14.461 14.461,14.461c7.97,0 14.462,-6.492 14.462,-14.461c0,-7.97 -6.492,-14.462 -14.462,-14.462Zm-0.021,1.285c0.511,0.013 0.924,0.439 0.924,0.951c0,0.522 -0.43,0.952 -0.952,0.952c-0.522,0 -0.951,-0.43 -0.951,-0.952c0,0 0,0 0,0c0,-0.522 0.429,-0.952 0.951,-0.952c0.01,0 0.019,0.001 0.028,0.001Zm2.178,1.566c3.379,0.633 6.313,2.723 8.016,5.709l-1.123,2.533c-0.193,0.438 0.006,0.952 0.44,1.147l2.16,0.958c0.067,0.675 0.076,1.355 0.025,2.031l-1.202,0c-0.12,0 -0.169,0.08 -0.169,0.196l0,0.551c0,1.297 -0.731,1.582 -1.373,1.652c-0.612,0.07 -1.288,-0.257 -1.374,-0.63c-0.361,-2.029 -0.961,-2.46 -1.909,-3.21c1.178,-0.746 2.401,-1.85 2.401,-3.325c0,-1.594 -1.092,-2.597 -1.835,-3.09c-1.046,-0.688 -2.203,-0.826 -2.515,-0.826l-12.421,0c1.717,-1.918 4.02,-3.218 6.55,-3.696l1.466,1.536c0.33,0.346 0.878,0.361 1.223,0.028l1.64,-1.564Zm-13.522,7.043c0.511,0.015 0.924,0.44 0.924,0.951c0,0.522 -0.43,0.952 -0.952,0.952c-0.522,0 -0.951,-0.43 -0.951,-0.952c0,0 0,0 0,0c0,-0.522 0.429,-0.951 0.951,-0.951c0.009,0 0.019,0 0.028,0Zm22.685,0.043c0.511,0.015 0.924,0.44 0.924,0.951c0,0.522 -0.43,0.952 -0.952,0.952c-0.522,0 -0.951,-0.43 -0.951,-0.952c0,0 0,0 0,0c0,-0.522 0.429,-0.952 0.951,-0.952c0.01,0 0.019,0 0.028,0.001Zm-20.892,0.153l1.658,0l0,7.477l-3.347,0c-0.414,-1.452 -0.542,-2.97 -0.38,-4.47l2.05,-0.912c0.438,-0.195 0.637,-0.706 0.441,-1.144l-0.422,-0.951Zm6.92,0.079l3.949,0c0.205,0 1.441,0.236 1.441,1.163c0,0.768 -0.948,1.043 -1.728,1.043l-3.665,0l0.003,-2.206Zm0,5.373l3.026,0c0.275,0 1.477,0.079 1.86,1.615c0.119,0.471 0.385,2.007 0.566,2.499c0.18,0.551 0.911,1.652 1.691,1.652l4.938,0c-0.331,0.444 -0.693,0.863 -1.083,1.255l-2.01,-0.432c-0.468,-0.101 -0.93,0.199 -1.031,0.667l-0.477,2.228c-3.104,1.406 -6.672,1.389 -9.762,-0.046l-0.478,-2.228c-0.101,-0.468 -0.56,-0.767 -1.028,-0.667l-1.967,0.423c-0.365,-0.377 -0.704,-0.778 -1.016,-1.2l9.567,0c0.107,0 0.181,-0.018 0.181,-0.119l0,-3.384c0,-0.097 -0.074,-0.119 -0.181,-0.119l-2.799,0l0.003,-2.144Zm-4.415,7.749c0.512,0.015 0.924,0.44 0.924,0.951c0,0.522 -0.429,0.952 -0.951,0.952c-0.522,0 -0.952,-0.43 -0.952,-0.952c0,0 0,0 0,0c0,-0.522 0.43,-0.952 0.952,-0.952c0.009,0 0.018,0.001 0.027,0.001Zm14.089,0.043c0.511,0.015 0.924,0.439 0.923,0.951c0,0.522 -0.429,0.952 -0.951,0.952c-0.522,0 -0.951,-0.43 -0.951,-0.952c0,0 0,0 0,0c0,-0.522 0.429,-0.952 0.951,-0.952c0.009,0 0.018,0 0.028,0.001Z"/><path id="logo-teeth" d="M29.647,16.002c0,7.49 -6.163,13.653 -13.654,13.653c-7.49,0 -13.654,-6.163 -13.654,-13.653c0,-7.491 6.164,-13.654 13.654,-13.654c7.491,0 13.654,6.163 13.654,13.654Zm-0.257,-1.319l2.13,1.319l-2.13,1.318l1.83,1.71l-2.344,0.878l1.463,2.035l-2.475,0.404l1.04,2.282l-2.506,-0.089l0.575,2.442l-2.441,-0.576l0.089,2.506l-2.283,-1.04l-0.403,2.475l-2.035,-1.462l-0.878,2.343l-1.71,-1.829l-1.319,2.129l-1.318,-2.129l-1.71,1.829l-0.878,-2.343l-2.035,1.462l-0.404,-2.475l-2.282,1.04l0.089,-2.506l-2.442,0.576l0.575,-2.442l-2.505,0.089l1.04,-2.282l-2.475,-0.404l1.462,-2.035l-2.343,-0.878l1.829,-1.71l-2.129,-1.318l2.129,-1.319l-1.829,-1.71l2.343,-0.878l-1.462,-2.035l2.475,-0.404l-1.04,-2.282l2.505,0.089l-0.575,-2.441l2.442,0.575l-0.089,-2.506l2.282,1.04l0.404,-2.475l2.035,1.463l0.878,-2.344l1.71,1.83l1.318,-2.13l1.319,2.13l1.71,-1.83l0.878,2.344l2.035,-1.463l0.403,2.475l2.283,-1.04l-0.089,2.506l2.441,-0.575l-0.575,2.441l2.506,-0.089l-1.04,2.282l2.475,0.404l-1.463,2.035l2.344,0.878l-1.83,1.71Z"/></svg>
diff --git a/src/librustdoc/html/static_files.rs b/src/librustdoc/html/static_files.rs
index 6bd7e53cdfbe2..213c7f3aab8b6 100644
--- a/src/librustdoc/html/static_files.rs
+++ b/src/librustdoc/html/static_files.rs
@@ -53,8 +53,10 @@ pub static LICENSE_MIT: &[u8] = include_bytes!("static/LICENSE-MIT.txt");
/// The contents of `rust-logo.png`, the default icon of the documentation.
pub static RUST_LOGO: &[u8] = include_bytes!("static/rust-logo.png");
-/// The contents of `favicon.ico`, the default favicon of the documentation.
-pub static RUST_FAVICON: &[u8] = include_bytes!("static/favicon.ico");
+/// The default documentation favicons (SVG and PNG fallbacks)
+pub static RUST_FAVICON_SVG: &[u8] = include_bytes!("static/favicon.svg");
+pub static RUST_FAVICON_PNG_16: &[u8] = include_bytes!("static/favicon-16x16.png");
+pub static RUST_FAVICON_PNG_32: &[u8] = include_bytes!("static/favicon-32x32.png");
/// The built-in themes given to every documentation site.
pub mod themes {
From a320ef751bcf3a0c09384cf887ea7eceab2fbee7 Mon Sep 17 00:00:00 2001
From: Dylan MacKenzie <ecstaticmorse@gmail.com>
Date: Wed, 23 Sep 2020 21:04:07 -0700
Subject: [PATCH 20/25] Suggest `const_mut_refs` for mutable references in
const fn
---
compiler/rustc_mir/src/transform/check_consts/ops.rs | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/compiler/rustc_mir/src/transform/check_consts/ops.rs b/compiler/rustc_mir/src/transform/check_consts/ops.rs
index e14dcf92b89d2..d978d9279810d 100644
--- a/compiler/rustc_mir/src/transform/check_consts/ops.rs
+++ b/compiler/rustc_mir/src/transform/check_consts/ops.rs
@@ -535,6 +535,7 @@ impl NonConstOp for UnsizingCast {
}
}
+// Types that cannot appear in the signature or locals of a `const fn`.
pub mod ty {
use super::*;
@@ -548,7 +549,13 @@ pub mod ty {
}
fn emit_error(&self, ccx: &ConstCx<'_, '_>, span: Span) {
- mcf_emit_error(ccx, span, "mutable references in const fn are unstable");
+ feature_err(
+ &ccx.tcx.sess.parse_sess,
+ sym::const_mut_refs,
+ span,
+ &format!("mutable references are not allowed in {}s", ccx.const_kind()),
+ )
+ .emit()
}
}
From e5e5e64ff1b91e57fed22e7a52e5de333980fafd Mon Sep 17 00:00:00 2001
From: Dylan MacKenzie <ecstaticmorse@gmail.com>
Date: Wed, 23 Sep 2020 21:05:59 -0700
Subject: [PATCH 21/25] Bless tests
---
.../feature-gate-const_mut_refs.rs | 2 +-
.../feature-gate-const_mut_refs.stderr | 8 ++---
src/test/ui/consts/const_let_assign3.stderr | 8 ++---
.../ui/consts/min_const_fn/min_const_fn.rs | 10 +++----
.../consts/min_const_fn/min_const_fn.stderr | 30 +++++++++----------
.../ui/consts/min_const_fn/mutable_borrow.rs | 4 +--
.../consts/min_const_fn/mutable_borrow.stderr | 14 ++++-----
src/test/ui/unsafe/ranged_ints2_const.stderr | 14 ++++-----
8 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/src/test/ui/consts/const-mut-refs/feature-gate-const_mut_refs.rs b/src/test/ui/consts/const-mut-refs/feature-gate-const_mut_refs.rs
index f31543af590d6..ce9be4ac5c2af 100644
--- a/src/test/ui/consts/const-mut-refs/feature-gate-const_mut_refs.rs
+++ b/src/test/ui/consts/const-mut-refs/feature-gate-const_mut_refs.rs
@@ -2,7 +2,7 @@ fn main() {
foo(&mut 5);
}
-const fn foo(x: &mut i32) -> i32 { //~ ERROR mutable references in const fn
+const fn foo(x: &mut i32) -> i32 { //~ ERROR mutable references
*x + 1
}
diff --git a/src/test/ui/consts/const-mut-refs/feature-gate-const_mut_refs.stderr b/src/test/ui/consts/const-mut-refs/feature-gate-const_mut_refs.stderr
index 83e050c7a5c8a..3f9bd37053a0e 100644
--- a/src/test/ui/consts/const-mut-refs/feature-gate-const_mut_refs.stderr
+++ b/src/test/ui/consts/const-mut-refs/feature-gate-const_mut_refs.stderr
@@ -1,12 +1,12 @@
-error[E0723]: mutable references in const fn are unstable
+error[E0658]: mutable references are not allowed in constant functions
--> $DIR/feature-gate-const_mut_refs.rs:5:14
|
LL | const fn foo(x: &mut i32) -> i32 {
| ^
|
- = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
- = help: add `#![feature(const_fn)]` to the crate attributes to enable
+ = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
+ = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
error: aborting due to previous error
-For more information about this error, try `rustc --explain E0723`.
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/consts/const_let_assign3.stderr b/src/test/ui/consts/const_let_assign3.stderr
index 785d9c8c2a5fb..15badea003736 100644
--- a/src/test/ui/consts/const_let_assign3.stderr
+++ b/src/test/ui/consts/const_let_assign3.stderr
@@ -1,11 +1,11 @@
-error[E0723]: mutable references in const fn are unstable
+error[E0658]: mutable references are not allowed in constant functions
--> $DIR/const_let_assign3.rs:8:18
|
LL | const fn foo(&mut self, x: u32) {
| ^^^^^^^^^
|
- = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
- = help: add `#![feature(const_fn)]` to the crate attributes to enable
+ = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
+ = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
error[E0764]: mutable references are not allowed in constants
--> $DIR/const_let_assign3.rs:16:5
@@ -29,5 +29,5 @@ LL | *y = 42;
error: aborting due to 4 previous errors
-Some errors have detailed explanations: E0019, E0723, E0764.
+Some errors have detailed explanations: E0019, E0658, E0764.
For more information about an error, try `rustc --explain E0019`.
diff --git a/src/test/ui/consts/min_const_fn/min_const_fn.rs b/src/test/ui/consts/min_const_fn/min_const_fn.rs
index 5dd70acb6ff1c..336d754b06a73 100644
--- a/src/test/ui/consts/min_const_fn/min_const_fn.rs
+++ b/src/test/ui/consts/min_const_fn/min_const_fn.rs
@@ -37,26 +37,26 @@ impl<T> Foo<T> {
const fn into_inner(self) -> T { self.0 } //~ destructors cannot be evaluated
const fn get(&self) -> &T { &self.0 }
const fn get_mut(&mut self) -> &mut T { &mut self.0 }
- //~^ mutable references in const fn are unstable
+ //~^ mutable references
}
impl<'a, T> Foo<T> {
const fn new_lt(t: T) -> Self { Foo(t) }
const fn into_inner_lt(self) -> T { self.0 } //~ destructors cannot be evaluated
const fn get_lt(&'a self) -> &T { &self.0 }
const fn get_mut_lt(&'a mut self) -> &mut T { &mut self.0 }
- //~^ mutable references in const fn are unstable
+ //~^ mutable references
}
impl<T: Sized> Foo<T> {
const fn new_s(t: T) -> Self { Foo(t) }
const fn into_inner_s(self) -> T { self.0 } //~ ERROR destructors
const fn get_s(&self) -> &T { &self.0 }
const fn get_mut_s(&mut self) -> &mut T { &mut self.0 }
- //~^ mutable references in const fn are unstable
+ //~^ mutable references
}
impl<T: ?Sized> Foo<T> {
const fn get_sq(&self) -> &T { &self.0 }
const fn get_mut_sq(&mut self) -> &mut T { &mut self.0 }
- //~^ mutable references in const fn are unstable
+ //~^ mutable references
}
@@ -99,7 +99,7 @@ const fn foo30_2_with_unsafe(x: *mut u32) -> usize { unsafe { x as usize } }
//~^ ERROR casting pointers to integers
const fn foo30_6() -> bool { let x = true; x }
const fn inc(x: &mut i32) { *x += 1 }
-//~^ ERROR mutable references in const fn are unstable
+//~^ ERROR mutable references
// ok
const fn foo36(a: bool, b: bool) -> bool { a && b }
diff --git a/src/test/ui/consts/min_const_fn/min_const_fn.stderr b/src/test/ui/consts/min_const_fn/min_const_fn.stderr
index d4498f061c64b..c96500e38ec83 100644
--- a/src/test/ui/consts/min_const_fn/min_const_fn.stderr
+++ b/src/test/ui/consts/min_const_fn/min_const_fn.stderr
@@ -6,14 +6,14 @@ LL | const fn into_inner(self) -> T { self.0 }
| |
| constant functions cannot evaluate destructors
-error[E0723]: mutable references in const fn are unstable
+error[E0658]: mutable references are not allowed in constant functions
--> $DIR/min_const_fn.rs:39:36
|
LL | const fn get_mut(&mut self) -> &mut T { &mut self.0 }
| ^^^^^^
|
- = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
- = help: add `#![feature(const_fn)]` to the crate attributes to enable
+ = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
+ = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
error[E0493]: destructors cannot be evaluated at compile-time
--> $DIR/min_const_fn.rs:44:28
@@ -23,14 +23,14 @@ LL | const fn into_inner_lt(self) -> T { self.0 }
| |
| constant functions cannot evaluate destructors
-error[E0723]: mutable references in const fn are unstable
+error[E0658]: mutable references are not allowed in constant functions
--> $DIR/min_const_fn.rs:46:42
|
LL | const fn get_mut_lt(&'a mut self) -> &mut T { &mut self.0 }
| ^^^^^^
|
- = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
- = help: add `#![feature(const_fn)]` to the crate attributes to enable
+ = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
+ = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
error[E0493]: destructors cannot be evaluated at compile-time
--> $DIR/min_const_fn.rs:51:27
@@ -40,23 +40,23 @@ LL | const fn into_inner_s(self) -> T { self.0 }
| |
| constant functions cannot evaluate destructors
-error[E0723]: mutable references in const fn are unstable
+error[E0658]: mutable references are not allowed in constant functions
--> $DIR/min_const_fn.rs:53:38
|
LL | const fn get_mut_s(&mut self) -> &mut T { &mut self.0 }
| ^^^^^^
|
- = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
- = help: add `#![feature(const_fn)]` to the crate attributes to enable
+ = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
+ = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
-error[E0723]: mutable references in const fn are unstable
+error[E0658]: mutable references are not allowed in constant functions
--> $DIR/min_const_fn.rs:58:39
|
LL | const fn get_mut_sq(&mut self) -> &mut T { &mut self.0 }
| ^^^^^^
|
- = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
- = help: add `#![feature(const_fn)]` to the crate attributes to enable
+ = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
+ = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
error[E0723]: trait bounds other than `Sized` on const fn parameters are unstable
--> $DIR/min_const_fn.rs:76:16
@@ -164,14 +164,14 @@ LL | const fn foo30_2_with_unsafe(x: *mut u32) -> usize { unsafe { x as usize }
= note: see issue #51910 <https://github.com/rust-lang/rust/issues/51910> for more information
= help: add `#![feature(const_raw_ptr_to_usize_cast)]` to the crate attributes to enable
-error[E0723]: mutable references in const fn are unstable
+error[E0658]: mutable references are not allowed in constant functions
--> $DIR/min_const_fn.rs:101:14
|
LL | const fn inc(x: &mut i32) { *x += 1 }
| ^
|
- = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
- = help: add `#![feature(const_fn)]` to the crate attributes to enable
+ = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
+ = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
error[E0723]: trait bounds other than `Sized` on const fn parameters are unstable
--> $DIR/min_const_fn.rs:110:6
diff --git a/src/test/ui/consts/min_const_fn/mutable_borrow.rs b/src/test/ui/consts/min_const_fn/mutable_borrow.rs
index 89acfea6ed8ff..580b1d50f774e 100644
--- a/src/test/ui/consts/min_const_fn/mutable_borrow.rs
+++ b/src/test/ui/consts/min_const_fn/mutable_borrow.rs
@@ -1,6 +1,6 @@
const fn mutable_ref_in_const() -> u8 {
let mut a = 0;
- let b = &mut a; //~ ERROR mutable references in const fn
+ let b = &mut a; //~ ERROR mutable references
*b
}
@@ -9,7 +9,7 @@ struct X;
impl X {
const fn inherent_mutable_ref_in_const() -> u8 {
let mut a = 0;
- let b = &mut a; //~ ERROR mutable references in const fn
+ let b = &mut a; //~ ERROR mutable references
*b
}
}
diff --git a/src/test/ui/consts/min_const_fn/mutable_borrow.stderr b/src/test/ui/consts/min_const_fn/mutable_borrow.stderr
index f5a3c168a86d7..4e5cdbb18aae3 100644
--- a/src/test/ui/consts/min_const_fn/mutable_borrow.stderr
+++ b/src/test/ui/consts/min_const_fn/mutable_borrow.stderr
@@ -1,21 +1,21 @@
-error[E0723]: mutable references in const fn are unstable
+error[E0658]: mutable references are not allowed in constant functions
--> $DIR/mutable_borrow.rs:3:9
|
LL | let b = &mut a;
| ^
|
- = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
- = help: add `#![feature(const_fn)]` to the crate attributes to enable
+ = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
+ = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
-error[E0723]: mutable references in const fn are unstable
+error[E0658]: mutable references are not allowed in constant functions
--> $DIR/mutable_borrow.rs:12:13
|
LL | let b = &mut a;
| ^
|
- = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
- = help: add `#![feature(const_fn)]` to the crate attributes to enable
+ = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
+ = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
error: aborting due to 2 previous errors
-For more information about this error, try `rustc --explain E0723`.
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/unsafe/ranged_ints2_const.stderr b/src/test/ui/unsafe/ranged_ints2_const.stderr
index d508d07791de9..1a6bcd36ee157 100644
--- a/src/test/ui/unsafe/ranged_ints2_const.stderr
+++ b/src/test/ui/unsafe/ranged_ints2_const.stderr
@@ -1,20 +1,20 @@
-error[E0723]: mutable references in const fn are unstable
+error[E0658]: mutable references are not allowed in constant functions
--> $DIR/ranged_ints2_const.rs:11:9
|
LL | let y = &mut x.0;
| ^
|
- = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
- = help: add `#![feature(const_fn)]` to the crate attributes to enable
+ = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
+ = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
-error[E0723]: mutable references in const fn are unstable
+error[E0658]: mutable references are not allowed in constant functions
--> $DIR/ranged_ints2_const.rs:18:9
|
LL | let y = unsafe { &mut x.0 };
| ^
|
- = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
- = help: add `#![feature(const_fn)]` to the crate attributes to enable
+ = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
+ = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
error[E0133]: mutation of layout constrained field is unsafe and requires unsafe function or block
--> $DIR/ranged_ints2_const.rs:11:13
@@ -26,5 +26,5 @@ LL | let y = &mut x.0;
error: aborting due to 3 previous errors
-Some errors have detailed explanations: E0133, E0723.
+Some errors have detailed explanations: E0133, E0658.
For more information about an error, try `rustc --explain E0133`.
From 13dc237037c8ef66423639c622d6018f1cf9a37e Mon Sep 17 00:00:00 2001
From: Mara Bos <m-ou.se@m-ou.se>
Date: Thu, 24 Sep 2020 20:50:09 +0200
Subject: [PATCH 22/25] Remove workaround for deref issue that no longer
exists.
The double underscores were used to work around issue #12808, which was
solved in 2016.
---
library/std/src/sys_common/remutex.rs | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/library/std/src/sys_common/remutex.rs b/library/std/src/sys_common/remutex.rs
index 360337c030be4..162eab2388d55 100644
--- a/library/std/src/sys_common/remutex.rs
+++ b/library/std/src/sys_common/remutex.rs
@@ -37,9 +37,7 @@ impl<T> RefUnwindSafe for ReentrantMutex<T> {}
/// guarded data.
#[must_use = "if unused the ReentrantMutex will immediately unlock"]
pub struct ReentrantMutexGuard<'a, T: 'a> {
- // funny underscores due to how Deref currently works (it disregards field
- // privacy).
- __lock: &'a ReentrantMutex<T>,
+ lock: &'a ReentrantMutex<T>,
}
impl<T> !marker::Send for ReentrantMutexGuard<'_, T> {}
@@ -129,7 +127,7 @@ impl<T: fmt::Debug + 'static> fmt::Debug for ReentrantMutex<T> {
impl<'mutex, T> ReentrantMutexGuard<'mutex, T> {
fn new(lock: &'mutex ReentrantMutex<T>) -> ReentrantMutexGuard<'mutex, T> {
- ReentrantMutexGuard { __lock: lock }
+ ReentrantMutexGuard { lock }
}
}
@@ -137,7 +135,7 @@ impl<T> Deref for ReentrantMutexGuard<'_, T> {
type Target = T;
fn deref(&self) -> &T {
- &self.__lock.data
+ &self.lock.data
}
}
@@ -145,7 +143,7 @@ impl<T> Drop for ReentrantMutexGuard<'_, T> {
#[inline]
fn drop(&mut self) {
unsafe {
- self.__lock.inner.unlock();
+ self.lock.inner.unlock();
}
}
}
From 7dec440340040ae377abcf22968a1d850a908f1b Mon Sep 17 00:00:00 2001
From: Simon Vandel Sillesen <simon.vandel@gmail.com>
Date: Thu, 24 Sep 2020 21:02:53 +0200
Subject: [PATCH 23/25] Resolve
https://github.com/rust-lang/rust/pull/76673#discussion_r494426303
---
compiler/rustc_middle/src/mir/terminator/mod.rs | 2 ++
compiler/rustc_mir/src/transform/remove_unneeded_drops.rs | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/compiler/rustc_middle/src/mir/terminator/mod.rs b/compiler/rustc_middle/src/mir/terminator/mod.rs
index fcfd648c2b7aa..8909f02270cb3 100644
--- a/compiler/rustc_middle/src/mir/terminator/mod.rs
+++ b/compiler/rustc_middle/src/mir/terminator/mod.rs
@@ -96,6 +96,8 @@ pub enum TerminatorKind<'tcx> {
/// P <- V
/// }
/// ```
+ ///
+ /// Note that DropAndReplace is eliminated as part of the `ElaborateDrops` pass.
DropAndReplace {
place: Place<'tcx>,
value: Operand<'tcx>,
diff --git a/compiler/rustc_mir/src/transform/remove_unneeded_drops.rs b/compiler/rustc_mir/src/transform/remove_unneeded_drops.rs
index f027f5e33a187..b9f29786c64ea 100644
--- a/compiler/rustc_mir/src/transform/remove_unneeded_drops.rs
+++ b/compiler/rustc_mir/src/transform/remove_unneeded_drops.rs
@@ -38,8 +38,7 @@ impl<'tcx> MirPass<'tcx> for RemoveUnneededDrops {
impl<'a, 'tcx> Visitor<'tcx> for RemoveUnneededDropsOptimizationFinder<'a, 'tcx> {
fn visit_terminator(&mut self, terminator: &Terminator<'tcx>, location: Location) {
match terminator.kind {
- TerminatorKind::Drop { place, target, .. }
- | TerminatorKind::DropAndReplace { place, target, .. } => {
+ TerminatorKind::Drop { place, target, .. } => {
let ty = place.ty(self.body, self.tcx);
let needs_drop = ty.ty.needs_drop(self.tcx, self.tcx.param_env(self.def_id));
if !needs_drop {
From ebf024bba84242e0c4176583b80ddd1cba071c42 Mon Sep 17 00:00:00 2001
From: Dylan MacKenzie <ecstaticmorse@gmail.com>
Date: Thu, 24 Sep 2020 11:11:53 -0700
Subject: [PATCH 24/25] Suggest `const_fn_transmute` instead of `const_fn`
---
compiler/rustc_mir/src/transform/check_consts/ops.rs | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/compiler/rustc_mir/src/transform/check_consts/ops.rs b/compiler/rustc_mir/src/transform/check_consts/ops.rs
index e14dcf92b89d2..9871300027740 100644
--- a/compiler/rustc_mir/src/transform/check_consts/ops.rs
+++ b/compiler/rustc_mir/src/transform/check_consts/ops.rs
@@ -489,7 +489,14 @@ impl NonConstOp for Transmute {
}
fn emit_error(&self, ccx: &ConstCx<'_, '_>, span: Span) {
- mcf_emit_error(ccx, span, "can only call `transmute` from const items, not `const fn`");
+ feature_err(
+ &ccx.tcx.sess.parse_sess,
+ sym::const_fn_transmute,
+ span,
+ &format!("`transmute` is not allowed in {}s", ccx.const_kind()),
+ )
+ .note("`transmute` is only allowed in constants and statics for now")
+ .emit();
}
}
From 0f594698aaa2b8330eca219f38105d2f4989c977 Mon Sep 17 00:00:00 2001
From: Dylan MacKenzie <ecstaticmorse@gmail.com>
Date: Thu, 24 Sep 2020 11:12:28 -0700
Subject: [PATCH 25/25] Bless tests
---
.../feature-gate-const_fn_transmute.rs | 18 ++---
.../feature-gate-const_fn_transmute.stderr | 65 +++++++++++--------
.../ui/internal/internal-unstable-const.rs | 2 +-
.../internal/internal-unstable-const.stderr | 9 +--
4 files changed, 52 insertions(+), 42 deletions(-)
diff --git a/src/test/ui/feature-gates/feature-gate-const_fn_transmute.rs b/src/test/ui/feature-gates/feature-gate-const_fn_transmute.rs
index 981680b5d1fad..9007e501bc2bf 100644
--- a/src/test/ui/feature-gates/feature-gate-const_fn_transmute.rs
+++ b/src/test/ui/feature-gates/feature-gate-const_fn_transmute.rs
@@ -6,33 +6,33 @@ struct Foo(u32);
const TRANSMUTED_U32: u32 = unsafe { mem::transmute(Foo(3)) };
const fn transmute_fn() -> u32 { unsafe { mem::transmute(Foo(3)) } }
-//~^ ERROR can only call `transmute` from const items, not `const fn`
+//~^ ERROR `transmute`
const fn transmute_fn_intrinsic() -> u32 { unsafe { std::intrinsics::transmute(Foo(3)) } }
-//~^ ERROR can only call `transmute` from const items, not `const fn`
+//~^ ERROR `transmute`
const fn transmute_fn_core_intrinsic() -> u32 { unsafe { core::intrinsics::transmute(Foo(3)) } }
-//~^ ERROR can only call `transmute` from const items, not `const fn`
+//~^ ERROR `transmute`
const unsafe fn unsafe_transmute_fn() -> u32 { mem::transmute(Foo(3)) }
-//~^ ERROR can only call `transmute` from const items, not `const fn`
+//~^ ERROR `transmute`
const unsafe fn unsafe_transmute_fn_intrinsic() -> u32 { std::intrinsics::transmute(Foo(3)) }
-//~^ ERROR can only call `transmute` from const items, not `const fn`
+//~^ ERROR `transmute`
const unsafe fn unsafe_transmute_fn_core_intrinsic() -> u32 { core::intrinsics::transmute(Foo(3)) }
-//~^ ERROR can only call `transmute` from const items, not `const fn`
+//~^ ERROR `transmute`
const fn safe_transmute_fn() -> u32 { mem::transmute(Foo(3)) }
-//~^ ERROR can only call `transmute` from const items, not `const fn`
+//~^ ERROR `transmute`
//~| ERROR call to unsafe function is unsafe and requires unsafe function or block
const fn safe_transmute_fn_intrinsic() -> u32 { std::intrinsics::transmute(Foo(3)) }
-//~^ ERROR can only call `transmute` from const items, not `const fn`
+//~^ ERROR `transmute`
//~| ERROR call to unsafe function is unsafe and requires unsafe function or block
const fn safe_transmute_fn_core_intrinsic() -> u32 { core::intrinsics::transmute(Foo(3)) }
-//~^ ERROR can only call `transmute` from const items, not `const fn`
+//~^ ERROR `transmute`
//~| ERROR call to unsafe function is unsafe and requires unsafe function or block
fn main() {}
diff --git a/src/test/ui/feature-gates/feature-gate-const_fn_transmute.stderr b/src/test/ui/feature-gates/feature-gate-const_fn_transmute.stderr
index 44430fd577d88..08ba14dc40e86 100644
--- a/src/test/ui/feature-gates/feature-gate-const_fn_transmute.stderr
+++ b/src/test/ui/feature-gates/feature-gate-const_fn_transmute.stderr
@@ -1,83 +1,92 @@
-error[E0723]: can only call `transmute` from const items, not `const fn`
+error[E0658]: `transmute` is not allowed in constant functions
--> $DIR/feature-gate-const_fn_transmute.rs:8:43
|
LL | const fn transmute_fn() -> u32 { unsafe { mem::transmute(Foo(3)) } }
| ^^^^^^^^^^^^^^^^^^^^^^
|
- = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
- = help: add `#![feature(const_fn)]` to the crate attributes to enable
+ = note: see issue #53605 <https://github.com/rust-lang/rust/issues/53605> for more information
+ = help: add `#![feature(const_fn_transmute)]` to the crate attributes to enable
+ = note: `transmute` is only allowed in constants and statics for now
-error[E0723]: can only call `transmute` from const items, not `const fn`
+error[E0658]: `transmute` is not allowed in constant functions
--> $DIR/feature-gate-const_fn_transmute.rs:11:53
|
LL | const fn transmute_fn_intrinsic() -> u32 { unsafe { std::intrinsics::transmute(Foo(3)) } }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
- = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
- = help: add `#![feature(const_fn)]` to the crate attributes to enable
+ = note: see issue #53605 <https://github.com/rust-lang/rust/issues/53605> for more information
+ = help: add `#![feature(const_fn_transmute)]` to the crate attributes to enable
+ = note: `transmute` is only allowed in constants and statics for now
-error[E0723]: can only call `transmute` from const items, not `const fn`
+error[E0658]: `transmute` is not allowed in constant functions
--> $DIR/feature-gate-const_fn_transmute.rs:14:58
|
LL | const fn transmute_fn_core_intrinsic() -> u32 { unsafe { core::intrinsics::transmute(Foo(3)) } }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
- = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
- = help: add `#![feature(const_fn)]` to the crate attributes to enable
+ = note: see issue #53605 <https://github.com/rust-lang/rust/issues/53605> for more information
+ = help: add `#![feature(const_fn_transmute)]` to the crate attributes to enable
+ = note: `transmute` is only allowed in constants and statics for now
-error[E0723]: can only call `transmute` from const items, not `const fn`
+error[E0658]: `transmute` is not allowed in constant functions
--> $DIR/feature-gate-const_fn_transmute.rs:17:48
|
LL | const unsafe fn unsafe_transmute_fn() -> u32 { mem::transmute(Foo(3)) }
| ^^^^^^^^^^^^^^^^^^^^^^
|
- = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
- = help: add `#![feature(const_fn)]` to the crate attributes to enable
+ = note: see issue #53605 <https://github.com/rust-lang/rust/issues/53605> for more information
+ = help: add `#![feature(const_fn_transmute)]` to the crate attributes to enable
+ = note: `transmute` is only allowed in constants and statics for now
-error[E0723]: can only call `transmute` from const items, not `const fn`
+error[E0658]: `transmute` is not allowed in constant functions
--> $DIR/feature-gate-const_fn_transmute.rs:20:58
|
LL | const unsafe fn unsafe_transmute_fn_intrinsic() -> u32 { std::intrinsics::transmute(Foo(3)) }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
- = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
- = help: add `#![feature(const_fn)]` to the crate attributes to enable
+ = note: see issue #53605 <https://github.com/rust-lang/rust/issues/53605> for more information
+ = help: add `#![feature(const_fn_transmute)]` to the crate attributes to enable
+ = note: `transmute` is only allowed in constants and statics for now
-error[E0723]: can only call `transmute` from const items, not `const fn`
+error[E0658]: `transmute` is not allowed in constant functions
--> $DIR/feature-gate-const_fn_transmute.rs:23:63
|
LL | const unsafe fn unsafe_transmute_fn_core_intrinsic() -> u32 { core::intrinsics::transmute(Foo(3)) }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
- = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
- = help: add `#![feature(const_fn)]` to the crate attributes to enable
+ = note: see issue #53605 <https://github.com/rust-lang/rust/issues/53605> for more information
+ = help: add `#![feature(const_fn_transmute)]` to the crate attributes to enable
+ = note: `transmute` is only allowed in constants and statics for now
-error[E0723]: can only call `transmute` from const items, not `const fn`
+error[E0658]: `transmute` is not allowed in constant functions
--> $DIR/feature-gate-const_fn_transmute.rs:26:39
|
LL | const fn safe_transmute_fn() -> u32 { mem::transmute(Foo(3)) }
| ^^^^^^^^^^^^^^^^^^^^^^
|
- = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
- = help: add `#![feature(const_fn)]` to the crate attributes to enable
+ = note: see issue #53605 <https://github.com/rust-lang/rust/issues/53605> for more information
+ = help: add `#![feature(const_fn_transmute)]` to the crate attributes to enable
+ = note: `transmute` is only allowed in constants and statics for now
-error[E0723]: can only call `transmute` from const items, not `const fn`
+error[E0658]: `transmute` is not allowed in constant functions
--> $DIR/feature-gate-const_fn_transmute.rs:30:49
|
LL | const fn safe_transmute_fn_intrinsic() -> u32 { std::intrinsics::transmute(Foo(3)) }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
- = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
- = help: add `#![feature(const_fn)]` to the crate attributes to enable
+ = note: see issue #53605 <https://github.com/rust-lang/rust/issues/53605> for more information
+ = help: add `#![feature(const_fn_transmute)]` to the crate attributes to enable
+ = note: `transmute` is only allowed in constants and statics for now
-error[E0723]: can only call `transmute` from const items, not `const fn`
+error[E0658]: `transmute` is not allowed in constant functions
--> $DIR/feature-gate-const_fn_transmute.rs:34:54
|
LL | const fn safe_transmute_fn_core_intrinsic() -> u32 { core::intrinsics::transmute(Foo(3)) }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
- = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
- = help: add `#![feature(const_fn)]` to the crate attributes to enable
+ = note: see issue #53605 <https://github.com/rust-lang/rust/issues/53605> for more information
+ = help: add `#![feature(const_fn_transmute)]` to the crate attributes to enable
+ = note: `transmute` is only allowed in constants and statics for now
error[E0133]: call to unsafe function is unsafe and requires unsafe function or block
--> $DIR/feature-gate-const_fn_transmute.rs:26:39
@@ -105,5 +114,5 @@ LL | const fn safe_transmute_fn_core_intrinsic() -> u32 { core::intrinsics::tran
error: aborting due to 12 previous errors
-Some errors have detailed explanations: E0133, E0723.
+Some errors have detailed explanations: E0133, E0658.
For more information about an error, try `rustc --explain E0133`.
diff --git a/src/test/ui/internal/internal-unstable-const.rs b/src/test/ui/internal/internal-unstable-const.rs
index b923bc22f6e5f..554c67be4e0b0 100644
--- a/src/test/ui/internal/internal-unstable-const.rs
+++ b/src/test/ui/internal/internal-unstable-const.rs
@@ -8,7 +8,7 @@
#[stable(feature = "rust1", since = "1.0.0")]
#[rustc_const_stable(feature = "rust1", since = "1.0.0")]
pub const fn foo() -> i32 {
- unsafe { std::mem::transmute(4u32) } //~ ERROR can only call `transmute` from const items
+ unsafe { std::mem::transmute(4u32) } //~ ERROR `transmute`
}
fn main() {}
diff --git a/src/test/ui/internal/internal-unstable-const.stderr b/src/test/ui/internal/internal-unstable-const.stderr
index 9626df23ec3c2..adfb8dc36918d 100644
--- a/src/test/ui/internal/internal-unstable-const.stderr
+++ b/src/test/ui/internal/internal-unstable-const.stderr
@@ -1,12 +1,13 @@
-error[E0723]: can only call `transmute` from const items, not `const fn`
+error[E0658]: `transmute` is not allowed in constant functions
--> $DIR/internal-unstable-const.rs:11:14
|
LL | unsafe { std::mem::transmute(4u32) }
| ^^^^^^^^^^^^^^^^^^^^^^^^^
|
- = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
- = help: add `#![feature(const_fn)]` to the crate attributes to enable
+ = note: see issue #53605 <https://github.com/rust-lang/rust/issues/53605> for more information
+ = help: add `#![feature(const_fn_transmute)]` to the crate attributes to enable
+ = note: `transmute` is only allowed in constants and statics for now
error: aborting due to previous error
-For more information about this error, try `rustc --explain E0723`.
+For more information about this error, try `rustc --explain E0658`.