Skip to content

Commit 0085672

Browse files
committed
Auto merge of #59949 - Centril:rollup-lsiqq1g, r=Centril
Rollup of 16 pull requests Successful merges: - #59675 (Stabilize the `alloc` crate.) - #59708 (Mark variables captured by reference as mutable correctly) - #59735 (remove lookup_char_pos_adj) - #59747 (Copy book.toml unstable book generator) - #59796 (Retire `IsNotConst` naming) - #59804 (Clean up jobserver integration) - #59818 (Eliminate `FnBox` usages from libstd.) - #59830 (Fix links on keyword docs.) - #59835 (Re-export NonZero signed variant in std) - #59852 (std: Add `{read,write}_vectored` for more types) - #59855 (Fix attributes position in type declaration) - #59858 (Make duplicate matcher bindings a hard error) - #59899 (In `-Zprint-type-size` output, sort enum variants by size.) - #59912 (MaybeUninit: remove deprecated functions) - #59925 (Fix paste error in split_ascii_whitespace docs.) - #59930 (Exclude some copies of old book editions from search engines) Failed merges: r? @ghost
2 parents e4c66af + cf370b4 commit 0085672

File tree

92 files changed

+584
-499
lines changed

Some content is hidden

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

92 files changed

+584
-499
lines changed

src/doc/robots.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,11 @@ Disallow: /1.0.0-beta.2/
1717
Disallow: /1.0.0-beta.3/
1818
Disallow: /1.0.0-beta.4/
1919
Disallow: /1.0.0-beta.5/
20+
Disallow: /book/first-edition/
21+
Disallow: /book/second-edition/
22+
Disallow: /stable/book/first-edition/
23+
Disallow: /stable/book/second-edition/
24+
Disallow: /beta/book/first-edition/
25+
Disallow: /beta/book/second-edition/
26+
Disallow: /nightly/book/first-edition/
27+
Disallow: /nightly/book/second-edition/

src/doc/unstable-book/book.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
[book]
22
title = "The Rust Unstable Book"
3+
author = "The Rust Community"

src/liballoc/lib.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,7 @@
5151
//! default global allocator. It is not compatible with the libc allocator API.
5252
5353
#![allow(unused_attributes)]
54-
#![unstable(feature = "alloc",
55-
reason = "this library is unlikely to be stabilized in its current \
56-
form or name",
57-
issue = "27783")]
54+
#![stable(feature = "alloc", since = "1.36.0")]
5855
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/",
5956
issue_tracker_base_url = "https://github.com/rust-lang/rust/issues/",
6057
test(no_crate_inject, attr(allow(unused_variables), deny(warnings))))]

src/liballoc/prelude/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
//!
66
//! ```
77
//! # #![allow(unused_imports)]
8-
//! # #![feature(alloc)]
98
//! #![feature(alloc_prelude)]
109
//! extern crate alloc;
1110
//! use alloc::prelude::v1::*;

src/liballoc/raw_vec.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ impl<T, A: Alloc> RawVec<T, A> {
256256
/// # Examples
257257
///
258258
/// ```
259-
/// # #![feature(alloc, raw_vec_internals)]
259+
/// # #![feature(raw_vec_internals)]
260260
/// # extern crate alloc;
261261
/// # use std::ptr;
262262
/// # use alloc::raw_vec::RawVec;
@@ -460,7 +460,7 @@ impl<T, A: Alloc> RawVec<T, A> {
460460
/// # Examples
461461
///
462462
/// ```
463-
/// # #![feature(alloc, raw_vec_internals)]
463+
/// # #![feature(raw_vec_internals)]
464464
/// # extern crate alloc;
465465
/// # use std::ptr;
466466
/// # use alloc::raw_vec::RawVec;

src/libarena/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#![deny(rust_2018_idioms)]
1515
#![cfg_attr(not(stage0), deny(internal))]
1616

17-
#![feature(alloc)]
1817
#![feature(core_intrinsics)]
1918
#![feature(dropck_eyepatch)]
2019
#![feature(raw_vec_internals)]

src/libcore/mem.rs

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1152,15 +1152,6 @@ impl<T> MaybeUninit<T> {
11521152
MaybeUninit { uninit: () }
11531153
}
11541154

1155-
/// Deprecated before stabilization.
1156-
#[unstable(feature = "maybe_uninit", issue = "53491")]
1157-
#[inline(always)]
1158-
// FIXME: still used by stdsimd
1159-
// #[rustc_deprecated(since = "1.35.0", reason = "use `uninit` instead")]
1160-
pub const fn uninitialized() -> MaybeUninit<T> {
1161-
Self::uninit()
1162-
}
1163-
11641155
/// Creates a new `MaybeUninit<T>` in an uninitialized state, with the memory being
11651156
/// filled with `0` bytes. It depends on `T` whether that already makes for
11661157
/// proper initialization. For example, `MaybeUninit<usize>::zeroed()` is initialized,
@@ -1221,14 +1212,6 @@ impl<T> MaybeUninit<T> {
12211212
}
12221213
}
12231214

1224-
/// Deprecated before stabilization.
1225-
#[unstable(feature = "maybe_uninit", issue = "53491")]
1226-
#[inline(always)]
1227-
#[rustc_deprecated(since = "1.35.0", reason = "use `write` instead")]
1228-
pub fn set(&mut self, val: T) -> &mut T {
1229-
self.write(val)
1230-
}
1231-
12321215
/// Gets a pointer to the contained value. Reading from this pointer or turning it
12331216
/// into a reference is undefined behavior unless the `MaybeUninit<T>` is initialized.
12341217
///
@@ -1346,15 +1329,6 @@ impl<T> MaybeUninit<T> {
13461329
ManuallyDrop::into_inner(self.value)
13471330
}
13481331

1349-
/// Deprecated before stabilization.
1350-
#[unstable(feature = "maybe_uninit", issue = "53491")]
1351-
#[inline(always)]
1352-
// FIXME: still used by stdsimd
1353-
// #[rustc_deprecated(since = "1.35.0", reason = "use `assume_init` instead")]
1354-
pub unsafe fn into_initialized(self) -> T {
1355-
self.assume_init()
1356-
}
1357-
13581332
/// Reads the value from the `MaybeUninit<T>` container. The resulting `T` is subject
13591333
/// to the usual drop handling.
13601334
///
@@ -1417,14 +1391,6 @@ impl<T> MaybeUninit<T> {
14171391
self.as_ptr().read()
14181392
}
14191393

1420-
/// Deprecated before stabilization.
1421-
#[unstable(feature = "maybe_uninit", issue = "53491")]
1422-
#[inline(always)]
1423-
#[rustc_deprecated(since = "1.35.0", reason = "use `read` instead")]
1424-
pub unsafe fn read_initialized(&self) -> T {
1425-
self.read()
1426-
}
1427-
14281394
/// Gets a reference to the contained value.
14291395
///
14301396
/// # Safety

src/libcore/str/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2712,7 +2712,7 @@ impl str {
27122712
/// All kinds of ASCII whitespace are considered:
27132713
///
27142714
/// ```
2715-
/// let mut iter = " Mary had\ta little \n\t lamb".split_whitespace();
2715+
/// let mut iter = " Mary had\ta little \n\t lamb".split_ascii_whitespace();
27162716
/// assert_eq!(Some("Mary"), iter.next());
27172717
/// assert_eq!(Some("had"), iter.next());
27182718
/// assert_eq!(Some("a"), iter.next());

src/libpanic_unwind/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
#![deny(rust_2018_idioms)]
2121

22-
#![feature(allocator_api)]
23-
#![feature(alloc)]
2422
#![feature(core_intrinsics)]
2523
#![feature(lang_items)]
2624
#![feature(libc)]

src/librustc/infer/error_reporting/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
278278
}
279279

280280
fn explain_span(self, heading: &str, span: Span) -> (String, Option<Span>) {
281-
let lo = self.sess.source_map().lookup_char_pos_adj(span.lo());
281+
let lo = self.sess.source_map().lookup_char_pos(span.lo());
282282
(
283283
format!("the {} at {}:{}", heading, lo.line, lo.col.to_usize() + 1),
284284
Some(span),

0 commit comments

Comments
 (0)