diff --git a/compiler/rustc_mir/src/borrow_check/type_check/mod.rs b/compiler/rustc_mir/src/borrow_check/type_check/mod.rs
index 3248554e20427..d27fcb2f26f19 100644
--- a/compiler/rustc_mir/src/borrow_check/type_check/mod.rs
+++ b/compiler/rustc_mir/src/borrow_check/type_check/mod.rs
@@ -97,7 +97,7 @@ mod relate_tys;
/// Type checks the given `mir` in the context of the inference
/// context `infcx`. Returns any region constraints that have yet to
-/// be proven. This result is includes liveness constraints that
+/// be proven. This result includes liveness constraints that
/// ensure that regions appearing in the types of all local variables
/// are live at all points where that local variable may later be
/// used.
diff --git a/library/std/src/primitive_docs.rs b/library/std/src/primitive_docs.rs
index c37111f665c47..a5292c8b878eb 100644
--- a/library/std/src/primitive_docs.rs
+++ b/library/std/src/primitive_docs.rs
@@ -553,8 +553,10 @@ mod prim_pointer {}
/// # Editions
///
/// Prior to Rust 1.53, arrays did not implement `IntoIterator` by value, so the method call
-/// `array.into_iter()` auto-referenced into a slice iterator. That behavior is preserved in the
-/// 2015 and 2018 editions of Rust for compatability, ignoring `IntoIterator` by value.
+/// `array.into_iter()` auto-referenced into a slice iterator. Right now, the old behavior
+/// is preserved in the 2015 and 2018 editions of Rust for compatibility, ignoring
+/// `IntoIterator` by value. In the future, the behavior on the 2015 and 2018 edition
+/// might be made consistent to the behavior of later editions.
///
#[cfg_attr(bootstrap, doc = "```rust,edition2018,ignore")]
#[cfg_attr(not(bootstrap), doc = "```rust,edition2018")]
@@ -601,6 +603,48 @@ mod prim_pointer {}
/// }
/// ```
///
+/// Future language versions might start treating the `array.into_iter()`
+/// syntax on editions 2015 and 2018 the same as on edition 2021. So code using
+/// those older editions should still be written with this change in mind, to
+/// prevent breakage in the future. The safest way to accomplish this is to
+/// avoid the `into_iter` syntax on those editions. If an edition update is not
+/// viable/desired, there are multiple alternatives:
+/// * use `iter`, equivalent to the old behavior, creating references
+/// * use [`array::IntoIter`], equivalent to the post-2021 behavior (Rust 1.51+)
+/// * replace `for ... in array.into_iter() {` with `for ... in array {`,
+/// equivalent to the post-2021 behavior (Rust 1.53+)
+///
+/// ```rust,edition2018
+/// use std::array::IntoIter;
+///
+/// let array: [i32; 3] = [0; 3];
+///
+/// // This iterates by reference:
+/// for item in array.iter() {
+/// let x: &i32 = item;
+/// println!("{}", x);
+/// }
+///
+/// // This iterates by value:
+/// for item in IntoIter::new(array) {
+/// let x: i32 = item;
+/// println!("{}", x);
+/// }
+///
+/// // This iterates by value:
+/// for item in array {
+/// let x: i32 = item;
+/// println!("{}", x);
+/// }
+///
+/// // IntoIter can also start a chain.
+/// // This iterates by value:
+/// for item in IntoIter::new(array).enumerate() {
+/// let (i, x): (usize, i32) = item;
+/// println!("array[{}] = {}", i, x);
+/// }
+/// ```
+///
/// [slice]: prim@slice
/// [`Debug`]: fmt::Debug
/// [`Hash`]: hash::Hash
diff --git a/library/std/src/sys/windows/process.rs b/library/std/src/sys/windows/process.rs
index 30bbfdd0dd1e2..a5799606142ec 100644
--- a/library/std/src/sys/windows/process.rs
+++ b/library/std/src/sys/windows/process.rs
@@ -19,9 +19,9 @@ use crate::sys::c;
use crate::sys::cvt;
use crate::sys::fs::{File, OpenOptions};
use crate::sys::handle::Handle;
-use crate::sys::mutex::Mutex;
use crate::sys::pipe::{self, AnonPipe};
use crate::sys::stdio;
+use crate::sys_common::mutex::StaticMutex;
use crate::sys_common::process::{CommandEnv, CommandEnvs};
use crate::sys_common::AsInner;
@@ -94,10 +94,6 @@ pub struct StdioPipes {
pub stderr: Option<AnonPipe>,
}
-struct DropGuard<'a> {
- lock: &'a Mutex,
-}
-
impl Command {
pub fn new(program: &OsStr) -> Command {
Command {
@@ -209,8 +205,9 @@ impl Command {
//
// For more information, msdn also has an article about this race:
// http://support.microsoft.com/kb/315939
- static CREATE_PROCESS_LOCK: Mutex = Mutex::new();
- let _guard = DropGuard::new(&CREATE_PROCESS_LOCK);
+ static CREATE_PROCESS_LOCK: StaticMutex = StaticMutex::new();
+
+ let _guard = unsafe { CREATE_PROCESS_LOCK.lock() };
let mut pipes = StdioPipes { stdin: None, stdout: None, stderr: None };
let null = Stdio::Null;
@@ -259,23 +256,6 @@ impl fmt::Debug for Command {
}
}
-impl<'a> DropGuard<'a> {
- fn new(lock: &'a Mutex) -> DropGuard<'a> {
- unsafe {
- lock.lock();
- DropGuard { lock }
- }
- }
-}
-
-impl<'a> Drop for DropGuard<'a> {
- fn drop(&mut self) {
- unsafe {
- self.lock.unlock();
- }
- }
-}
-
impl Stdio {
fn to_handle(&self, stdio_id: c::DWORD, pipe: &mut Option<AnonPipe>) -> io::Result<Handle> {
match *self {
diff --git a/rustfmt.toml b/rustfmt.toml
index af807aa6f739e..480b19a5e9336 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -7,6 +7,8 @@ merge_derives = false
# tidy only checks files which are not ignored, each entry follows gitignore style
ignore = [
"/build/",
+ "/*-build/",
+ "/build-*/",
"/vendor/",
# tests for now are not formatted, as they are sometimes pretty-printing constrained
diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
index 6626fead774d6..9b76c8b9a2d26 100644
--- a/src/bootstrap/check.rs
+++ b/src/bootstrap/check.rs
@@ -280,7 +280,7 @@ impl Step for CodegenBackend {
}
macro_rules! tool_check_step {
- ($name:ident, $path:expr, $source_type:expr) => {
+ ($name:ident, $path:literal, $($alias:literal, )* $source_type:path) => {
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
pub struct $name {
pub target: TargetSelection,
@@ -292,7 +292,7 @@ macro_rules! tool_check_step {
const DEFAULT: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
- run.path($path)
+ run.paths(&[ $path, $($alias),* ])
}
fn make_run(run: RunConfig<'_>) {
@@ -321,11 +321,9 @@ macro_rules! tool_check_step {
}
// Enable internal lints for clippy and rustdoc
- // NOTE: this intentionally doesn't enable lints for any other tools,
- // see https://github.com/rust-lang/rust/pull/80573#issuecomment-754010776
- if $path == "src/tools/rustdoc" || $path == "src/tools/clippy" {
- cargo.rustflag("-Zunstable-options");
- }
+ // NOTE: this doesn't enable lints for any other tools unless they explicitly add `#![warn(rustc::internal)]`
+ // See https://github.com/rust-lang/rust/pull/80573#issuecomment-754010776
+ cargo.rustflag("-Zunstable-options");
builder.info(&format!(
"Checking stage{} {} artifacts ({} -> {})",
@@ -363,7 +361,7 @@ macro_rules! tool_check_step {
};
}
-tool_check_step!(Rustdoc, "src/tools/rustdoc", SourceType::InTree);
+tool_check_step!(Rustdoc, "src/tools/rustdoc", "src/librustdoc", SourceType::InTree);
// Clippy is a hybrid. It is an external tool, but uses a git subtree instead
// of a submodule. Since the SourceType only drives the deny-warnings
// behavior, treat it as in-tree so that any new warnings in clippy will be
diff --git a/src/bootstrap/defaults/config.codegen.toml b/src/bootstrap/defaults/config.codegen.toml
index a9505922ca7fc..011ff6821b771 100644
--- a/src/bootstrap/defaults/config.codegen.toml
+++ b/src/bootstrap/defaults/config.codegen.toml
@@ -11,3 +11,5 @@ assertions = true
debug-logging = true
# This greatly increases the speed of rebuilds, especially when there are only minor changes. However, it makes the initial build slightly slower.
incremental = true
+# Print backtrace on internal compiler errors during bootstrap
+backtrace-on-ice = true
diff --git a/src/bootstrap/defaults/config.compiler.toml b/src/bootstrap/defaults/config.compiler.toml
index 883bfead64e4a..4d689d117bc0d 100644
--- a/src/bootstrap/defaults/config.compiler.toml
+++ b/src/bootstrap/defaults/config.compiler.toml
@@ -6,6 +6,8 @@
debug-logging = true
# This greatly increases the speed of rebuilds, especially when there are only minor changes. However, it makes the initial build slightly slower.
incremental = true
+# Print backtrace on internal compiler errors during bootstrap
+backtrace-on-ice = true
[llvm]
# Will download LLVM from CI if available on your platform.
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile
index 08f07eb828406..ea70771a570ac 100644
--- a/src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile
@@ -38,6 +38,7 @@ ENV HOSTS=x86_64-unknown-linux-musl
ENV RUST_CONFIGURE_ARGS \
--musl-root-x86_64=/usr/local/x86_64-linux-musl \
--enable-extended \
+ --enable-sanitizers \
--enable-profiler \
--enable-lld \
--set target.x86_64-unknown-linux-musl.crt-static=false \
diff --git a/src/doc/book b/src/doc/book
index b54090a99ec7c..50dd06cb71beb 160000
--- a/src/doc/book
+++ b/src/doc/book
@@ -1 +1 @@
-Subproject commit b54090a99ec7c4b46a5203a9c927fdbc311bb1f5
+Subproject commit 50dd06cb71beb27fdc0eebade5509cdcc1f821ed
diff --git a/src/doc/reference b/src/doc/reference
index e1abb17cd94cd..d23f9da846961 160000
--- a/src/doc/reference
+++ b/src/doc/reference
@@ -1 +1 @@
-Subproject commit e1abb17cd94cd5a8a374b48e1bc8134a2208ed48
+Subproject commit d23f9da8469617e6c81121d9fd123443df70595d
diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example
index c80f0b09fc15b..e0a721f5202e6 160000
--- a/src/doc/rust-by-example
+++ b/src/doc/rust-by-example
@@ -1 +1 @@
-Subproject commit c80f0b09fc15b9251825343be910c08531938ab2
+Subproject commit e0a721f5202e6d9bec0aff99f10e44480c0da9e7
diff --git a/src/doc/rustc-dev-guide b/src/doc/rustc-dev-guide
index a9bd2bbf31e4f..e72b43a64925c 160000
--- a/src/doc/rustc-dev-guide
+++ b/src/doc/rustc-dev-guide
@@ -1 +1 @@
-Subproject commit a9bd2bbf31e4f92b5d3d8e80b22839d0cc7a2022
+Subproject commit e72b43a64925ce053dc7830e21c1a57ba00499bd
diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs
index 518dbc6eeb3b9..7de72d8198725 100644
--- a/src/librustdoc/html/render/mod.rs
+++ b/src/librustdoc/html/render/mod.rs
@@ -1546,7 +1546,7 @@ fn render_impl(
let aliases = if aliases.is_empty() {
String::new()
} else {
- format!(" aliases=\"{}\"", aliases.join(","))
+ format!(" data-aliases=\"{}\"", aliases.join(","))
};
if let Some(use_absolute) = use_absolute {
write!(
diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js
index 7fbb97beae7e9..95b18490641ff 100644
--- a/src/librustdoc/html/static/main.js
+++ b/src/librustdoc/html/static/main.js
@@ -834,7 +834,7 @@ function hideThemeButtonState() {
// (like "Send" and "Sync").
var inlined_types = new Set();
onEachLazy(synthetic_implementors.getElementsByClassName("impl"), function(el) {
- var aliases = el.getAttribute("aliases");
+ var aliases = el.getAttribute("data-aliases");
if (!aliases) {
return;
}
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 26aaf0db6f620..985aeedabb106 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -16,7 +16,7 @@
#![feature(type_ascription)]
#![feature(iter_intersperse)]
#![recursion_limit = "256"]
-#![deny(rustc::internal)]
+#![warn(rustc::internal)]
#[macro_use]
extern crate lazy_static;
diff --git a/src/test/rustdoc/auto_aliases.rs b/src/test/rustdoc/auto_aliases.rs
index b8f3527510cc9..56e0770ab5c49 100644
--- a/src/test/rustdoc/auto_aliases.rs
+++ b/src/test/rustdoc/auto_aliases.rs
@@ -1,6 +1,6 @@
#![feature(auto_traits)]
-// @has auto_aliases/trait.Bar.html '//h3[@aliases="auto_aliases::Foo"]' 'impl Bar for Foo'
+// @has auto_aliases/trait.Bar.html '//h3[@data-aliases="auto_aliases::Foo"]' 'impl Bar for Foo'
pub struct Foo;
pub auto trait Bar {}
diff --git a/src/test/ui/thread-local-issue-37508.rs b/src/test/ui/thread-local-issue-37508.rs
new file mode 100644
index 0000000000000..87e4601c3c88a
--- /dev/null
+++ b/src/test/ui/thread-local-issue-37508.rs
@@ -0,0 +1,22 @@
+// compile-flags: --crate-type rlib -C opt-level=3 -C code-model=large
+// build-pass
+
+#![no_std]
+#![feature(thread_local)]
+
+pub struct BB;
+
+#[thread_local]
+static mut KEY: Key = Key { inner: BB, dtor_running: false };
+
+pub unsafe fn set() -> Option<&'static BB> {
+ if KEY.dtor_running {
+ return None;
+ }
+ Some(&KEY.inner)
+}
+
+pub struct Key {
+ inner: BB,
+ dtor_running: bool,
+}
diff --git a/src/test/ui/typeck/issue-75883.rs b/src/test/ui/typeck/issue-75883.rs
new file mode 100644
index 0000000000000..3a59ca049ba3e
--- /dev/null
+++ b/src/test/ui/typeck/issue-75883.rs
@@ -0,0 +1,22 @@
+// Regression test for #75883.
+
+pub struct UI {}
+
+impl UI {
+ pub fn run() -> Result<_> {
+ //~^ ERROR: this enum takes 2 type arguments but only 1 type argument was supplied
+ //~| ERROR: the type placeholder `_` is not allowed within types on item signatures
+ let mut ui = UI {};
+ ui.interact();
+
+ unimplemented!();
+ }
+
+ pub fn interact(&mut self) -> Result<_> {
+ //~^ ERROR: this enum takes 2 type arguments but only 1 type argument was supplied
+ //~| ERROR: the type placeholder `_` is not allowed within types on item signatures
+ unimplemented!();
+ }
+}
+
+fn main() {}
diff --git a/src/test/ui/typeck/issue-75883.stderr b/src/test/ui/typeck/issue-75883.stderr
new file mode 100644
index 0000000000000..a6b2eb8f9727c
--- /dev/null
+++ b/src/test/ui/typeck/issue-75883.stderr
@@ -0,0 +1,52 @@
+error[E0107]: this enum takes 2 type arguments but only 1 type argument was supplied
+ --> $DIR/issue-75883.rs:6:21
+ |
+LL | pub fn run() -> Result<_> {
+ | ^^^^^^ - supplied 1 type argument
+ | |
+ | expected 2 type arguments
+ |
+note: enum defined here, with 2 type parameters: `T`, `E`
+ --> $SRC_DIR/core/src/result.rs:LL:COL
+ |
+LL | pub enum Result<T, E> {
+ | ^^^^^^ - -
+help: add missing type argument
+ |
+LL | pub fn run() -> Result<_, E> {
+ | ^^^
+
+error[E0107]: this enum takes 2 type arguments but only 1 type argument was supplied
+ --> $DIR/issue-75883.rs:15:35
+ |
+LL | pub fn interact(&mut self) -> Result<_> {
+ | ^^^^^^ - supplied 1 type argument
+ | |
+ | expected 2 type arguments
+ |
+note: enum defined here, with 2 type parameters: `T`, `E`
+ --> $SRC_DIR/core/src/result.rs:LL:COL
+ |
+LL | pub enum Result<T, E> {
+ | ^^^^^^ - -
+help: add missing type argument
+ |
+LL | pub fn interact(&mut self) -> Result<_, E> {
+ | ^^^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+ --> $DIR/issue-75883.rs:15:42
+ |
+LL | pub fn interact(&mut self) -> Result<_> {
+ | ^ not allowed in type signatures
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+ --> $DIR/issue-75883.rs:6:28
+ |
+LL | pub fn run() -> Result<_> {
+ | ^ not allowed in type signatures
+
+error: aborting due to 4 previous errors
+
+Some errors have detailed explanations: E0107, E0121.
+For more information about an error, try `rustc --explain E0107`.
diff --git a/src/test/ui/typeck/issue-80779.rs b/src/test/ui/typeck/issue-80779.rs
new file mode 100644
index 0000000000000..6791976196f36
--- /dev/null
+++ b/src/test/ui/typeck/issue-80779.rs
@@ -0,0 +1,13 @@
+// Regression test for #80779.
+
+pub struct T<'a>(&'a str);
+
+pub fn f<'a>(val: T<'a>) -> _ {
+ //~^ ERROR: the type placeholder `_` is not allowed within types on item signatures
+ g(val)
+}
+
+pub fn g(_: T<'static>) -> _ {}
+//~^ ERROR: the type placeholder `_` is not allowed within types on item signatures
+
+fn main() {}
diff --git a/src/test/ui/typeck/issue-80779.stderr b/src/test/ui/typeck/issue-80779.stderr
new file mode 100644
index 0000000000000..aca494520f8b2
--- /dev/null
+++ b/src/test/ui/typeck/issue-80779.stderr
@@ -0,0 +1,21 @@
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+ --> $DIR/issue-80779.rs:10:28
+ |
+LL | pub fn g(_: T<'static>) -> _ {}
+ | ^
+ | |
+ | not allowed in type signatures
+ | help: replace with the correct return type: `()`
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+ --> $DIR/issue-80779.rs:5:29
+ |
+LL | pub fn f<'a>(val: T<'a>) -> _ {
+ | ^
+ | |
+ | not allowed in type signatures
+ | help: replace with the correct return type: `()`
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0121`.
diff --git a/src/tools/clippy/clippy_lints/src/lib.rs b/src/tools/clippy/clippy_lints/src/lib.rs
index 757d7669bd806..8c74284fa46ea 100644
--- a/src/tools/clippy/clippy_lints/src/lib.rs
+++ b/src/tools/clippy/clippy_lints/src/lib.rs
@@ -17,7 +17,7 @@
// warn on lints, that are included in `rust-lang/rust`s bootstrap
#![warn(rust_2018_idioms, unused_lifetimes)]
// warn on rustc internal lints
-#![deny(rustc::internal)]
+#![warn(rustc::internal)]
// FIXME: switch to something more ergonomic here, once available.
// (Currently there is no way to opt into sysroot crates without `extern crate`.)
diff --git a/src/tools/clippy/src/driver.rs b/src/tools/clippy/src/driver.rs
index fa0c5f01430b6..750a23e8c9841 100644
--- a/src/tools/clippy/src/driver.rs
+++ b/src/tools/clippy/src/driver.rs
@@ -4,7 +4,7 @@
// warn on lints, that are included in `rust-lang/rust`s bootstrap
#![warn(rust_2018_idioms, unused_lifetimes)]
// warn on rustc internal lints
-#![deny(rustc::internal)]
+#![warn(rustc::internal)]
// FIXME: switch to something more ergonomic here, once available.
// (Currently there is no way to opt into sysroot crates without `extern crate`.)
diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs
index cb84fd8be6fec..b14b5aeb57236 100644
--- a/src/tools/tidy/src/features.rs
+++ b/src/tools/tidy/src/features.rs
@@ -423,6 +423,15 @@ fn map_lib_features(
continue;
}};
}
+
+ lazy_static::lazy_static! {
+ static ref COMMENT_LINE: Regex = Regex::new(r"^\s*//").unwrap();
+ }
+ // exclude commented out lines
+ if COMMENT_LINE.is_match(line) {
+ continue;
+ }
+
if let Some((ref name, ref mut f)) = becoming_feature {
if f.tracking_issue.is_none() {
f.tracking_issue = find_attr_val(line, "issue").and_then(handle_issue_none);