diff --git a/compiler/rustc_resolve/src/ident.rs b/compiler/rustc_resolve/src/ident.rs
index 78bd3c4e49f2e..b6a23317dc99d 100644
--- a/compiler/rustc_resolve/src/ident.rs
+++ b/compiler/rustc_resolve/src/ident.rs
@@ -998,14 +998,14 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
let Some(module) = single_import.imported_module.get() else {
return Err((Undetermined, Weak::No));
};
- let ImportKind::Single { source: ident, source_bindings, .. } = &single_import.kind
+ let ImportKind::Single { source: ident, target, target_bindings, .. } =
+ &single_import.kind
else {
unreachable!();
};
- if binding.map_or(false, |binding| binding.module().is_some())
- && source_bindings.iter().all(|binding| matches!(binding.get(), Err(Undetermined)))
- {
- // This branch allows the binding to be defined or updated later,
+ if (ident != target) && target_bindings.iter().all(|binding| binding.get().is_none()) {
+ // This branch allows the binding to be defined or updated later if the target name
+ // can hide the source but these bindings are not obtained.
// avoiding module inconsistency between the resolve process and the finalize process.
// See more details in #124840
return Err((Undetermined, Weak::No));
diff --git a/library/alloc/src/lib.rs b/library/alloc/src/lib.rs
index 4ac0c9b15be7a..4749b8880fbc4 100644
--- a/library/alloc/src/lib.rs
+++ b/library/alloc/src/lib.rs
@@ -121,7 +121,6 @@
#![feature(deref_pure_trait)]
#![feature(dispatch_from_dyn)]
#![feature(error_generic_member_access)]
-#![feature(error_in_core)]
#![feature(exact_size_is_empty)]
#![feature(extend_one)]
#![feature(fmt_internals)]
diff --git a/library/core/src/error.rs b/library/core/src/error.rs
index a3f2b767054e1..da18fdc6e1d1f 100644
--- a/library/core/src/error.rs
+++ b/library/core/src/error.rs
@@ -1,5 +1,5 @@
#![doc = include_str!("error.md")]
-#![unstable(feature = "error_in_core", issue = "103765")]
+#![stable(feature = "error_in_core", since = "CURRENT_RUSTC_VERSION")]
#[cfg(test)]
mod tests;
@@ -130,7 +130,6 @@ pub trait Error: Debug + Display {
///
/// ```rust
/// #![feature(error_generic_member_access)]
- /// #![feature(error_in_core)]
/// use core::fmt;
/// use core::error::{request_ref, Request};
///
@@ -361,8 +360,7 @@ impl dyn Error {
/// Get a string value from an error.
///
/// ```rust
-/// # #![feature(error_generic_member_access)]
-/// # #![feature(error_in_core)]
+/// #![feature(error_generic_member_access)]
/// use std::error::Error;
/// use core::error::request_value;
///
@@ -385,8 +383,7 @@ where
/// Get a string reference from an error.
///
/// ```rust
-/// # #![feature(error_generic_member_access)]
-/// # #![feature(error_in_core)]
+/// #![feature(error_generic_member_access)]
/// use core::error::Error;
/// use core::error::request_ref;
///
@@ -458,7 +455,6 @@ where
///
/// ```
/// #![feature(error_generic_member_access)]
-/// #![feature(error_in_core)]
/// use core::fmt;
/// use core::error::Request;
/// use core::error::request_ref;
@@ -529,7 +525,6 @@ impl<'a> Request<'a> {
///
/// ```rust
/// #![feature(error_generic_member_access)]
- /// #![feature(error_in_core)]
///
/// use core::error::Request;
///
@@ -564,7 +559,6 @@ impl<'a> Request<'a> {
///
/// ```rust
/// #![feature(error_generic_member_access)]
- /// #![feature(error_in_core)]
///
/// use core::error::Request;
///
@@ -600,7 +594,6 @@ impl<'a> Request<'a> {
///
/// ```rust
/// #![feature(error_generic_member_access)]
- /// #![feature(error_in_core)]
///
/// use core::error::Request;
///
@@ -633,7 +626,6 @@ impl<'a> Request<'a> {
///
/// ```rust
/// #![feature(error_generic_member_access)]
- /// #![feature(error_in_core)]
///
/// use core::error::Request;
///
@@ -700,7 +692,6 @@ impl<'a> Request<'a> {
///
/// ```rust
/// #![feature(error_generic_member_access)]
- /// #![feature(error_in_core)]
///
/// use core::error::Request;
/// use core::error::request_value;
@@ -788,7 +779,6 @@ impl<'a> Request<'a> {
///
/// ```rust
/// #![feature(error_generic_member_access)]
- /// #![feature(error_in_core)]
///
/// use core::error::Request;
/// use core::error::request_ref;
diff --git a/library/core/src/pin.rs b/library/core/src/pin.rs
index d8fc3b7177f38..0d2aa3070a19f 100644
--- a/library/core/src/pin.rs
+++ b/library/core/src/pin.rs
@@ -184,7 +184,7 @@
//! requires at least a level of pointer indirection each time a new object is added to the mix
//! (and, practically, a heap allocation).
//!
-//! Although there were other reason as well, this issue of expensive composition is the key thing
+//! Although there were other reasons as well, this issue of expensive composition is the key thing
//! that drove Rust towards adopting a different model. It is particularly a problem
//! when one considers, for example, the implications of composing together the [`Future`]s which
//! will eventually make up an asynchronous task (including address-sensitive `async fn` state
diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs
index 20ff6fd7687fe..f632883b563d3 100644
--- a/library/core/tests/lib.rs
+++ b/library/core/tests/lib.rs
@@ -112,7 +112,6 @@
#![feature(const_slice_from_ref)]
#![feature(waker_getters)]
#![feature(error_generic_member_access)]
-#![feature(error_in_core)]
#![feature(trait_upcasting)]
#![feature(is_ascii_octdigit)]
#![feature(get_many_mut)]
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
index 9d6576fa84117..1c226f9f08f10 100644
--- a/library/std/src/lib.rs
+++ b/library/std/src/lib.rs
@@ -324,7 +324,6 @@
#![feature(core_io_borrowed_buf)]
#![feature(duration_constants)]
#![feature(error_generic_member_access)]
-#![feature(error_in_core)]
#![feature(error_iter)]
#![feature(exact_size_is_empty)]
#![feature(exclusive_wrapper)]
diff --git a/library/std/src/sys/pal/unix/fs.rs b/library/std/src/sys/pal/unix/fs.rs
index 1aaa8cc2a9d9a..56a0f8e39c4aa 100644
--- a/library/std/src/sys/pal/unix/fs.rs
+++ b/library/std/src/sys/pal/unix/fs.rs
@@ -1561,6 +1561,8 @@ impl fmt::Debug for File {
target_os = "netbsd",
target_os = "openbsd",
target_os = "vxworks",
+ target_os = "solaris",
+ target_os = "illumos",
target_vendor = "apple",
))]
fn get_mode(fd: c_int) -> Option<(bool, bool)> {
@@ -1583,6 +1585,8 @@ impl fmt::Debug for File {
target_os = "netbsd",
target_os = "openbsd",
target_os = "vxworks",
+ target_os = "solaris",
+ target_os = "illumos",
target_vendor = "apple",
)))]
fn get_mode(_fd: c_int) -> Option<(bool, bool)> {
diff --git a/src/ci/docker/host-x86_64/mingw-check/Dockerfile b/src/ci/docker/host-x86_64/mingw-check/Dockerfile
index d0da7d3066013..0d9c21c4487bf 100644
--- a/src/ci/docker/host-x86_64/mingw-check/Dockerfile
+++ b/src/ci/docker/host-x86_64/mingw-check/Dockerfile
@@ -61,8 +61,8 @@ ENV SCRIPT python3 ../x.py check --stage 0 --set build.optimized-compiler-builti
/scripts/validate-toolstate.sh && \
/scripts/validate-error-codes.sh && \
reuse --include-submodules lint && \
- # Runs checks to ensure that there are no ES5 issues in our JS code.
- es-check es8 ../src/librustdoc/html/static/js/*.js && \
+ # Runs checks to ensure that there are no issues in our JS code.
+ es-check es2019 ../src/librustdoc/html/static/js/*.js && \
eslint -c ../src/librustdoc/html/static/.eslintrc.js ../src/librustdoc/html/static/js/*.js && \
eslint -c ../src/tools/rustdoc-js/.eslintrc.js ../src/tools/rustdoc-js/tester.js && \
eslint -c ../src/tools/rustdoc-gui/.eslintrc.js ../src/tools/rustdoc-gui/tester.js
diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile
index c8c754914aa63..d228dfc87ebe2 100644
--- a/src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile
+++ b/src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile
@@ -1,3 +1,6 @@
+# This job builds a toolchain capable of building Fuchsia, and then builds
+# Fuchsia. See the build-fuchsia.sh script in this directory for more details.
+
FROM ubuntu:22.04
ARG DEBIAN_FRONTEND=noninteractive
diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh b/src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh
index 9cc508fe92881..913a0b0c09c35 100755
--- a/src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh
+++ b/src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh
@@ -2,50 +2,87 @@
# Downloads and builds the Fuchsia operating system using a toolchain installed
# in $RUST_INSTALL_DIR.
+#
+# You may run this script locally using Docker with the following command:
+#
+# $ src/ci/docker/run.sh x86_64-gnu-integration
+#
+# Alternatively, from within the container with --dev, assuming you have made it
+# as far as building the toolchain with the above command:
+#
+# $ src/ci/docker/run.sh --dev x86_64-gnu-integration
+# docker# git config --global --add safe.directory /checkout/obj/fuchsia
+# docker# ../src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh
+#
+# Also see the docs in the rustc-dev-guide for more info:
+# https://github.com/rust-lang/rustc-dev-guide/pull/1989
set -euf -o pipefail
-INTEGRATION_SHA=1011e3298775ee7cdf6f6dc73e808d6a86e33bd6
+# Set this variable to 1 to disable updating the Fuchsia checkout. This is
+# useful for making local changes. You can find the Fuchsia checkout in
+# `obj/x86_64-gnu-integration/fuchsia` in your local checkout after running this
+# job for the first time.
+KEEP_CHECKOUT=
+
+# Any upstream refs that should be cherry-picked. This can be used to include
+# Gerrit changes from https://fxrev.dev during development (click the "Download"
+# button on a changelist to see the cherry pick ref). Example:
+# PICK_REFS=(refs/changes/71/1054071/2 refs/changes/74/1054574/2)
PICK_REFS=()
+# The commit hash of Fuchsia's integration.git to check out. This controls the
+# commit hash of fuchsia.git and some other repos in the "monorepo" checkout, in
+# addition to versions of prebuilts. It should be bumped regularly by the
+# Fuchsia team – we aim for every 1-2 months.
+INTEGRATION_SHA=1011e3298775ee7cdf6f6dc73e808d6a86e33bd6
+
checkout=fuchsia
jiri=.jiri_root/bin/jiri
set -x
-# This script will:
-# - create a directory named "fuchsia" if it does not exist
-# - download "jiri" to "fuchsia/.jiri_root/bin"
-curl -s "https://fuchsia.googlesource.com/jiri/+/HEAD/scripts/bootstrap_jiri?format=TEXT" \
- | base64 --decode \
- | bash -s $checkout
-
-cd $checkout
-
-$jiri init \
- -partial=true \
- -analytics-opt=false \
- .
-
-$jiri import \
- -name=integration \
- -revision=$INTEGRATION_SHA \
- -overwrite=true \
- flower \
- "https://fuchsia.googlesource.com/integration"
-
-if [ -d ".git" ]; then
- # Wipe out any local changes if we're reusing a checkout.
- git checkout --force JIRI_HEAD
-fi
+if [ -z "$KEEP_CHECKOUT" ]; then
+ # This script will:
+ # - create a directory named "fuchsia" if it does not exist
+ # - download "jiri" to "fuchsia/.jiri_root/bin"
+ curl -s "https://fuchsia.googlesource.com/jiri/+/HEAD/scripts/bootstrap_jiri?format=TEXT" \
+ | base64 --decode \
+ | bash -s $checkout
-$jiri update -autoupdate=false
+ cd $checkout
-echo integration commit = $(git -C integration rev-parse HEAD)
+ $jiri init \
+ -partial=true \
+ -analytics-opt=false \
+ .
-for git_ref in "${PICK_REFS[@]}"; do
- git fetch https://fuchsia.googlesource.com/fuchsia $git_ref
- git cherry-pick --no-commit FETCH_HEAD
-done
+ $jiri import \
+ -name=integration \
+ -revision=$INTEGRATION_SHA \
+ -overwrite=true \
+ flower \
+ "https://fuchsia.googlesource.com/integration"
+
+ if [ -d ".git" ]; then
+ # Wipe out any local changes if we're reusing a checkout.
+ git checkout --force JIRI_HEAD
+ fi
+
+ $jiri update -autoupdate=false
+
+ echo integration commit = $(git -C integration rev-parse HEAD)
+
+ for git_ref in "${PICK_REFS[@]}"; do
+ git fetch https://fuchsia.googlesource.com/fuchsia $git_ref
+ git cherry-pick --no-commit FETCH_HEAD
+ done
+else
+ echo Reusing existing Fuchsia checkout
+ cd $checkout
+fi
+# Run the script inside the Fuchsia checkout responsible for building Fuchsia.
+# You can change arguments to the build by setting KEEP_CHECKOUT=1 above and
+# modifying them in build_fuchsia_from_rust_ci.sh.
bash scripts/rust/build_fuchsia_from_rust_ci.sh
diff --git a/src/librustdoc/html/static/.eslintrc.js b/src/librustdoc/html/static/.eslintrc.js
index a1e9cc6dfa142..fbb096fe9c753 100644
--- a/src/librustdoc/html/static/.eslintrc.js
+++ b/src/librustdoc/html/static/.eslintrc.js
@@ -5,7 +5,7 @@ module.exports = {
},
"extends": "eslint:recommended",
"parserOptions": {
- "ecmaVersion": 8,
+ "ecmaVersion": 2019,
"sourceType": "module"
},
"rules": {
diff --git a/src/librustdoc/html/static/js/externs.js b/src/librustdoc/html/static/js/externs.js
index 8cebce7ae8610..6fd60d6cc3461 100644
--- a/src/librustdoc/html/static/js/externs.js
+++ b/src/librustdoc/html/static/js/externs.js
@@ -41,8 +41,9 @@ let ParserState;
* foundElems: number,
* totalElems: number,
* literalSearch: boolean,
- * corrections: Array<{from: string, to: integer}>,
+ * corrections: Array<{from: string, to: integer}> | null,
* typeFingerprint: Uint32Array,
+ * error: Array<string> | null,
* }}
*/
let ParsedQuery;
diff --git a/src/librustdoc/html/static/js/search.js b/src/librustdoc/html/static/js/search.js
index 76a6fc9008eaa..8ac4b53673f4c 100644
--- a/src/librustdoc/html/static/js/search.js
+++ b/src/librustdoc/html/static/js/search.js
@@ -89,6 +89,10 @@ const ROOT_PATH = typeof window !== "undefined" ? window.rootPath : "../";
// of permutations we need to check.
const UNBOXING_LIMIT = 5;
+// used for search query verification
+const REGEX_IDENT = /\p{ID_Start}\p{ID_Continue}*|_\p{ID_Continue}+/uy;
+const REGEX_INVALID_TYPE_FILTER = /[^a-z]/ui;
+
// In the search display, allows to switch between tabs.
function printTab(nb) {
let iter = 0;
@@ -410,18 +414,21 @@ function initSearch(rawSearchIndex) {
}
/**
- * Returns `true` if the given `c` character is valid for an ident.
+ * If the current parser position is at the beginning of an identifier,
+ * move the position to the end of it and return `true`. Otherwise, return `false`.
*
- * @param {string} c
+ * @param {ParserState} parserState
*
* @return {boolean}
*/
- function isIdentCharacter(c) {
- return (
- c === "_" ||
- (c >= "0" && c <= "9") ||
- (c >= "a" && c <= "z") ||
- (c >= "A" && c <= "Z"));
+ function consumeIdent(parserState) {
+ REGEX_IDENT.lastIndex = parserState.pos;
+ const match = parserState.userQuery.match(REGEX_IDENT);
+ if (match) {
+ parserState.pos += match[0].length;
+ return true;
+ }
+ return false;
}
/**
@@ -618,70 +625,62 @@ function initSearch(rawSearchIndex) {
* @return {integer}
*/
function getIdentEndPosition(parserState) {
- const start = parserState.pos;
+ let afterIdent = consumeIdent(parserState);
let end = parserState.pos;
- let foundExclamation = -1;
+ let macroExclamation = -1;
while (parserState.pos < parserState.length) {
const c = parserState.userQuery[parserState.pos];
- if (!isIdentCharacter(c)) {
- if (c === "!") {
- if (foundExclamation !== -1) {
- throw ["Cannot have more than one ", "!", " in an ident"];
- } else if (parserState.pos + 1 < parserState.length &&
- isIdentCharacter(parserState.userQuery[parserState.pos + 1])
- ) {
+ if (c === "!") {
+ if (macroExclamation !== -1) {
+ throw ["Cannot have more than one ", "!", " in an ident"];
+ } else if (parserState.pos + 1 < parserState.length) {
+ const pos = parserState.pos;
+ parserState.pos++;
+ const beforeIdent = consumeIdent(parserState);
+ parserState.pos = pos;
+ if (beforeIdent) {
throw ["Unexpected ", "!", ": it can only be at the end of an ident"];
}
- foundExclamation = parserState.pos;
- } else if (isPathSeparator(c)) {
- if (c === ":") {
- if (!isPathStart(parserState)) {
+ }
+ if (afterIdent) macroExclamation = parserState.pos;
+ } else if (isPathSeparator(c)) {
+ if (c === ":") {
+ if (!isPathStart(parserState)) {
+ break;
+ }
+ // Skip current ":".
+ parserState.pos += 1;
+ } else {
+ while (parserState.pos + 1 < parserState.length) {
+ const next_c = parserState.userQuery[parserState.pos + 1];
+ if (next_c !== " ") {
break;
}
- // Skip current ":".
parserState.pos += 1;
- } else {
- while (parserState.pos + 1 < parserState.length) {
- const next_c = parserState.userQuery[parserState.pos + 1];
- if (next_c !== " ") {
- break;
- }
- parserState.pos += 1;
- }
}
- if (foundExclamation !== -1) {
- if (foundExclamation !== start &&
- isIdentCharacter(parserState.userQuery[foundExclamation - 1])
- ) {
- throw ["Cannot have associated items in macros"];
- } else {
- // while the never type has no associated macros, we still
- // can parse a path like that
- foundExclamation = -1;
- }
- }
- } else if (
- c === "[" ||
- c === "(" ||
- isEndCharacter(c) ||
- isSpecialStartCharacter(c) ||
- isSeparatorCharacter(c)
- ) {
- break;
- } else if (parserState.pos > 0) {
- throw ["Unexpected ", c, " after ", parserState.userQuery[parserState.pos - 1]];
- } else {
- throw ["Unexpected ", c];
}
+ if (macroExclamation !== -1) {
+ throw ["Cannot have associated items in macros"];
+ }
+ } else if (
+ c === "[" ||
+ c === "(" ||
+ isEndCharacter(c) ||
+ isSpecialStartCharacter(c) ||
+ isSeparatorCharacter(c)
+ ) {
+ break;
+ } else if (parserState.pos > 0) {
+ throw ["Unexpected ", c, " after ", parserState.userQuery[parserState.pos - 1],
+ " (not a valid identifier)"];
+ } else {
+ throw ["Unexpected ", c, " (not a valid identifier)"];
}
parserState.pos += 1;
+ afterIdent = consumeIdent(parserState);
end = parserState.pos;
}
- // if start == end - 1, we got the never type
- if (foundExclamation !== -1 &&
- foundExclamation !== start &&
- isIdentCharacter(parserState.userQuery[foundExclamation - 1])
- ) {
+ if (macroExclamation !== -1) {
if (parserState.typeFilter === null) {
parserState.typeFilter = "macro";
} else if (parserState.typeFilter !== "macro") {
@@ -693,7 +692,7 @@ function initSearch(rawSearchIndex) {
" both specified",
];
}
- end = foundExclamation;
+ end = macroExclamation;
}
return end;
}
@@ -1071,16 +1070,15 @@ function initSearch(rawSearchIndex) {
function checkExtraTypeFilterCharacters(start, parserState) {
const query = parserState.userQuery.slice(start, parserState.pos).trim();
- for (const c in query) {
- if (!isIdentCharacter(query[c])) {
- throw [
- "Unexpected ",
- query[c],
- " in type filter (before ",
- ":",
- ")",
- ];
- }
+ const match = query.match(REGEX_INVALID_TYPE_FILTER);
+ if (match) {
+ throw [
+ "Unexpected ",
+ match[0],
+ " in type filter (before ",
+ ":",
+ ")",
+ ];
}
}
@@ -2127,7 +2125,7 @@ function initSearch(rawSearchIndex) {
};
}
- function handleAliases(ret, query, filterCrates, currentCrate) {
+ async function handleAliases(ret, query, filterCrates, currentCrate) {
const lowerQuery = query.toLowerCase();
// We separate aliases and crate aliases because we want to have current crate
// aliases to be before the others in the displayed results.
@@ -2163,6 +2161,15 @@ function initSearch(rawSearchIndex) {
crateAliases.sort(sortFunc);
aliases.sort(sortFunc);
+ const fetchDesc = alias => {
+ return searchIndexEmptyDesc.get(alias.crate).contains(alias.bitIndex) ?
+ "" : searchState.loadDesc(alias);
+ };
+ const [crateDescs, descs] = await Promise.all([
+ Promise.all(crateAliases.map(fetchDesc)),
+ Promise.all(aliases.map(fetchDesc)),
+ ]);
+
const pushFunc = alias => {
alias.alias = query;
const res = buildHrefAndPath(alias);
@@ -2176,7 +2183,13 @@ function initSearch(rawSearchIndex) {
}
};
+ aliases.forEach((alias, i) => {
+ alias.desc = descs[i];
+ });
aliases.forEach(pushFunc);
+ crateAliases.forEach((alias, i) => {
+ alias.desc = crateDescs[i];
+ });
crateAliases.forEach(pushFunc);
}
@@ -2538,7 +2551,8 @@ function initSearch(rawSearchIndex) {
sorted_returned,
sorted_others,
parsedQuery);
- handleAliases(ret, parsedQuery.original.replace(/"/g, ""), filterCrates, currentCrate);
+ await handleAliases(ret, parsedQuery.original.replace(/"/g, ""),
+ filterCrates, currentCrate);
await Promise.all([ret.others, ret.returned, ret.in_args].map(async list => {
const descs = await Promise.all(list.map(result => {
return searchIndexEmptyDesc.get(result.crate).contains(result.bitIndex) ?
diff --git a/src/tools/clippy/tests/ui/std_instead_of_core.fixed b/src/tools/clippy/tests/ui/std_instead_of_core.fixed
index ec4ae2ea13c53..6ede7bfcd9f66 100644
--- a/src/tools/clippy/tests/ui/std_instead_of_core.fixed
+++ b/src/tools/clippy/tests/ui/std_instead_of_core.fixed
@@ -45,8 +45,8 @@ fn std_instead_of_core() {
let _ = std::env!("PATH");
- // do not lint until `error_in_core` is stable
- use std::error::Error;
+ use core::error::Error;
+ //~^ ERROR: used import from `std` instead of `core`
// lint items re-exported from private modules, `core::iter::traits::iterator::Iterator`
use core::iter::Iterator;
diff --git a/src/tools/clippy/tests/ui/std_instead_of_core.rs b/src/tools/clippy/tests/ui/std_instead_of_core.rs
index c12c459c7eb4b..e22b4f61f3ecc 100644
--- a/src/tools/clippy/tests/ui/std_instead_of_core.rs
+++ b/src/tools/clippy/tests/ui/std_instead_of_core.rs
@@ -45,8 +45,8 @@ fn std_instead_of_core() {
let _ = std::env!("PATH");
- // do not lint until `error_in_core` is stable
use std::error::Error;
+ //~^ ERROR: used import from `std` instead of `core`
// lint items re-exported from private modules, `core::iter::traits::iterator::Iterator`
use std::iter::Iterator;
diff --git a/src/tools/clippy/tests/ui/std_instead_of_core.stderr b/src/tools/clippy/tests/ui/std_instead_of_core.stderr
index 8f920511cc5d0..22cb9db7050b8 100644
--- a/src/tools/clippy/tests/ui/std_instead_of_core.stderr
+++ b/src/tools/clippy/tests/ui/std_instead_of_core.stderr
@@ -49,6 +49,12 @@ error: used import from `std` instead of `core`
LL | let cell_absolute = ::std::cell::Cell::new(8u32);
| ^^^ help: consider importing the item from `core`: `core`
+error: used import from `std` instead of `core`
+ --> tests/ui/std_instead_of_core.rs:48:9
+ |
+LL | use std::error::Error;
+ | ^^^ help: consider importing the item from `core`: `core`
+
error: used import from `std` instead of `core`
--> tests/ui/std_instead_of_core.rs:52:9
|
@@ -79,5 +85,5 @@ LL | use alloc::slice::from_ref;
= note: `-D clippy::alloc-instead-of-core` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::alloc_instead_of_core)]`
-error: aborting due to 12 previous errors
+error: aborting due to 13 previous errors
diff --git a/src/tools/rustdoc-gui/.eslintrc.js b/src/tools/rustdoc-gui/.eslintrc.js
index f4aadc071998b..3eccbc74cb95e 100644
--- a/src/tools/rustdoc-gui/.eslintrc.js
+++ b/src/tools/rustdoc-gui/.eslintrc.js
@@ -6,7 +6,7 @@ module.exports = {
},
"extends": "eslint:recommended",
"parserOptions": {
- "ecmaVersion": 2018,
+ "ecmaVersion": 2019,
"sourceType": "module"
},
"rules": {
diff --git a/src/tools/rustdoc-js/.eslintrc.js b/src/tools/rustdoc-js/.eslintrc.js
index b9d0e251c242b..3eccbc74cb95e 100644
--- a/src/tools/rustdoc-js/.eslintrc.js
+++ b/src/tools/rustdoc-js/.eslintrc.js
@@ -6,7 +6,7 @@ module.exports = {
},
"extends": "eslint:recommended",
"parserOptions": {
- "ecmaVersion": 8,
+ "ecmaVersion": 2019,
"sourceType": "module"
},
"rules": {
diff --git a/tests/rustdoc-js-std/parser-errors.js b/tests/rustdoc-js-std/parser-errors.js
index ffd169812b631..c4d7c2b0b8597 100644
--- a/tests/rustdoc-js-std/parser-errors.js
+++ b/tests/rustdoc-js-std/parser-errors.js
@@ -24,7 +24,7 @@ const PARSED = [
original: "-> *",
returned: [],
userQuery: "-> *",
- error: "Unexpected `*` after ` `",
+ error: "Unexpected `*` after ` ` (not a valid identifier)",
},
{
query: 'a<"P">',
@@ -204,16 +204,25 @@ const PARSED = [
original: "_:",
returned: [],
userQuery: "_:",
- error: "Unexpected `:` (expected path after type filter `_:`)",
+ error: "Unexpected `_` (not a valid identifier)",
},
{
- query: "_:a",
+ query: "ab:",
elems: [],
foundElems: 0,
- original: "_:a",
+ original: "ab:",
returned: [],
- userQuery: "_:a",
- error: "Unknown type filter `_`",
+ userQuery: "ab:",
+ error: "Unexpected `:` (expected path after type filter `ab:`)",
+ },
+ {
+ query: "a:b",
+ elems: [],
+ foundElems: 0,
+ original: "a:b",
+ returned: [],
+ userQuery: "a:b",
+ error: "Unknown type filter `a`",
},
{
query: "a-bb",
@@ -240,7 +249,7 @@ const PARSED = [
original: "ab'",
returned: [],
userQuery: "ab'",
- error: "Unexpected `'` after `b`",
+ error: "Unexpected `'` after `b` (not a valid identifier)",
},
{
query: "a->",
diff --git a/tests/rustdoc-js/basic.js b/tests/rustdoc-js/basic.js
index e186d510887cb..c38b8435c2d88 100644
--- a/tests/rustdoc-js/basic.js
+++ b/tests/rustdoc-js/basic.js
@@ -1,6 +1,6 @@
const EXPECTED = {
'query': 'Fo',
'others': [
- { 'path': 'basic', 'name': 'Foo' },
+ { 'path': 'basic', 'name': 'Foo', 'desc': 'Docs for Foo' },
],
};
diff --git a/tests/rustdoc-js/doc-alias.js b/tests/rustdoc-js/doc-alias.js
index 7e4e8a776d899..e57bd71419dcd 100644
--- a/tests/rustdoc-js/doc-alias.js
+++ b/tests/rustdoc-js/doc-alias.js
@@ -5,6 +5,7 @@ const EXPECTED = [
{
'path': 'doc_alias',
'name': 'Struct',
+ 'desc': 'Doc for <code>Struct</code>',
'alias': 'StructItem',
'href': '../doc_alias/struct.Struct.html',
'is_alias': true
@@ -17,6 +18,7 @@ const EXPECTED = [
{
'path': 'doc_alias::Struct',
'name': 'field',
+ 'desc': 'Doc for <code>Struct</code>’s <code>field</code>',
'alias': 'StructFieldItem',
'href': '../doc_alias/struct.Struct.html#structfield.field',
'is_alias': true
@@ -29,6 +31,7 @@ const EXPECTED = [
{
'path': 'doc_alias::Struct',
'name': 'method',
+ 'desc': 'Doc for <code>Struct::method</code>',
'alias': 'StructMethodItem',
'href': '../doc_alias/struct.Struct.html#method.method',
'is_alias': true
@@ -45,6 +48,7 @@ const EXPECTED = [
{
'path': 'doc_alias::Struct',
'name': 'ImplConstItem',
+ 'desc': 'Doc for <code>Struct::ImplConstItem</code>',
'alias': 'StructImplConstItem',
'href': '../doc_alias/struct.Struct.html#associatedconstant.ImplConstItem',
'is_alias': true
@@ -57,6 +61,7 @@ const EXPECTED = [
{
'path': 'doc_alias::Struct',
'name': 'function',
+ 'desc': 'Doc for <code>Trait::function</code> implemented for Struct',
'alias': 'ImplTraitFunction',
'href': '../doc_alias/struct.Struct.html#method.function',
'is_alias': true
@@ -69,6 +74,7 @@ const EXPECTED = [
{
'path': 'doc_alias',
'name': 'Enum',
+ 'desc': 'Doc for <code>Enum</code>',
'alias': 'EnumItem',
'href': '../doc_alias/enum.Enum.html',
'is_alias': true
@@ -81,6 +87,7 @@ const EXPECTED = [
{
'path': 'doc_alias::Enum',
'name': 'Variant',
+ 'desc': 'Doc for <code>Enum::Variant</code>',
'alias': 'VariantItem',
'href': '../doc_alias/enum.Enum.html#variant.Variant',
'is_alias': true
@@ -93,6 +100,7 @@ const EXPECTED = [
{
'path': 'doc_alias::Enum',
'name': 'method',
+ 'desc': 'Doc for <code>Enum::method</code>',
'alias': 'EnumMethodItem',
'href': '../doc_alias/enum.Enum.html#method.method',
'is_alias': true
@@ -105,6 +113,7 @@ const EXPECTED = [
{
'path': 'doc_alias',
'name': 'Typedef',
+ 'desc': 'Doc for type alias <code>Typedef</code>',
'alias': 'TypedefItem',
'href': '../doc_alias/type.Typedef.html',
'is_alias': true
@@ -117,6 +126,7 @@ const EXPECTED = [
{
'path': 'doc_alias',
'name': 'Trait',
+ 'desc': 'Doc for <code>Trait</code>',
'alias': 'TraitItem',
'href': '../doc_alias/trait.Trait.html',
'is_alias': true
@@ -129,6 +139,7 @@ const EXPECTED = [
{
'path': 'doc_alias::Trait',
'name': 'Target',
+ 'desc': 'Doc for <code>Trait::Target</code>',
'alias': 'TraitTypeItem',
'href': '../doc_alias/trait.Trait.html#associatedtype.Target',
'is_alias': true
@@ -141,6 +152,7 @@ const EXPECTED = [
{
'path': 'doc_alias::Trait',
'name': 'AssociatedConst',
+ 'desc': 'Doc for <code>Trait::AssociatedConst</code>',
'alias': 'AssociatedConstItem',
'href': '../doc_alias/trait.Trait.html#associatedconstant.AssociatedConst',
'is_alias': true
@@ -153,6 +165,7 @@ const EXPECTED = [
{
'path': 'doc_alias::Trait',
'name': 'function',
+ 'desc': 'Doc for <code>Trait::function</code>',
'alias': 'TraitFunctionItem',
'href': '../doc_alias/trait.Trait.html#tymethod.function',
'is_alias': true
@@ -165,6 +178,7 @@ const EXPECTED = [
{
'path': 'doc_alias',
'name': 'function',
+ 'desc': 'Doc for <code>function</code>',
'alias': 'FunctionItem',
'href': '../doc_alias/fn.function.html',
'is_alias': true
@@ -177,6 +191,7 @@ const EXPECTED = [
{
'path': 'doc_alias',
'name': 'Module',
+ 'desc': 'Doc for <code>Module</code>',
'alias': 'ModuleItem',
'href': '../doc_alias/Module/index.html',
'is_alias': true
@@ -189,6 +204,7 @@ const EXPECTED = [
{
'path': 'doc_alias',
'name': 'Const',
+ 'desc': 'Doc for <code>Const</code>',
'alias': 'ConstItem',
'href': '../doc_alias/constant.Const.html',
'is_alias': true
@@ -205,6 +221,7 @@ const EXPECTED = [
{
'path': 'doc_alias',
'name': 'Static',
+ 'desc': 'Doc for <code>Static</code>',
'alias': 'StaticItem',
'href': '../doc_alias/static.Static.html',
'is_alias': true
@@ -217,6 +234,7 @@ const EXPECTED = [
{
'path': 'doc_alias',
'name': 'Union',
+ 'desc': 'Doc for <code>Union</code>',
'alias': 'UnionItem',
'href': '../doc_alias/union.Union.html',
'is_alias': true
@@ -225,6 +243,7 @@ const EXPECTED = [
{
'path': 'doc_alias::Union',
'name': 'union_item',
+ 'desc': 'Doc for <code>Union::union_item</code>',
'href': '../doc_alias/union.Union.html#structfield.union_item'
},
],
@@ -235,6 +254,7 @@ const EXPECTED = [
{
'path': 'doc_alias::Union',
'name': 'union_item',
+ 'desc': 'Doc for <code>Union::union_item</code>',
'alias': 'UnionFieldItem',
'href': '../doc_alias/union.Union.html#structfield.union_item',
'is_alias': true
@@ -247,6 +267,7 @@ const EXPECTED = [
{
'path': 'doc_alias::Union',
'name': 'method',
+ 'desc': 'Doc for <code>Union::method</code>',
'alias': 'UnionMethodItem',
'href': '../doc_alias/union.Union.html#method.method',
'is_alias': true
@@ -259,6 +280,7 @@ const EXPECTED = [
{
'path': 'doc_alias',
'name': 'Macro',
+ 'desc': 'Doc for <code>Macro</code>',
'alias': 'MacroItem',
'href': '../doc_alias/macro.Macro.html',
'is_alias': true
diff --git a/tests/rustdoc-js/doc-alias.rs b/tests/rustdoc-js/doc-alias.rs
index 453b55c956c7a..bf075385327ae 100644
--- a/tests/rustdoc-js/doc-alias.rs
+++ b/tests/rustdoc-js/doc-alias.rs
@@ -1,12 +1,16 @@
+/// Doc for `Struct`
#[doc(alias = "StructItem")]
pub struct Struct {
+ /// Doc for `Struct`'s `field`
#[doc(alias = "StructFieldItem")]
pub field: u32,
}
impl Struct {
+ /// Doc for `Struct::ImplConstItem`
#[doc(alias = "StructImplConstItem")]
pub const ImplConstItem: i32 = 0;
+ /// Doc for `Struct::method`
#[doc(alias = "StructMethodItem")]
pub fn method(&self) {}
}
@@ -15,61 +19,78 @@ impl Trait for Struct {
type Target = u32;
const AssociatedConst: i32 = 12;
+ /// Doc for `Trait::function` implemented for Struct
#[doc(alias = "ImplTraitFunction")]
fn function() -> Self::Target {
0
}
}
+/// Doc for `Enum`
#[doc(alias = "EnumItem")]
pub enum Enum {
+ /// Doc for `Enum::Variant`
#[doc(alias = "VariantItem")]
Variant,
}
impl Enum {
+ /// Doc for `Enum::method`
#[doc(alias = "EnumMethodItem")]
pub fn method(&self) {}
}
+/// Doc for type alias `Typedef`
#[doc(alias = "TypedefItem")]
pub type Typedef = i32;
+/// Doc for `Trait`
#[doc(alias = "TraitItem")]
pub trait Trait {
+ /// Doc for `Trait::Target`
#[doc(alias = "TraitTypeItem")]
type Target;
+ /// Doc for `Trait::AssociatedConst`
#[doc(alias = "AssociatedConstItem")]
const AssociatedConst: i32;
+ /// Doc for `Trait::function`
#[doc(alias = "TraitFunctionItem")]
fn function() -> Self::Target;
}
+/// Doc for `function`
#[doc(alias = "FunctionItem")]
pub fn function() {}
+/// Doc for `Module`
#[doc(alias = "ModuleItem")]
pub mod Module {}
+/// Doc for `Const`
#[doc(alias = "ConstItem")]
pub const Const: u32 = 0;
+/// Doc for `Static`
#[doc(alias = "StaticItem")]
pub static Static: u32 = 0;
+/// Doc for `Union`
#[doc(alias = "UnionItem")]
pub union Union {
+ /// Doc for `Union::union_item`
#[doc(alias = "UnionFieldItem")]
pub union_item: u32,
pub y: f32,
}
impl Union {
+ /// Doc for `Union::method`
#[doc(alias = "UnionMethodItem")]
pub fn method(&self) {}
}
+/// Doc for `Macro`
#[doc(alias = "MacroItem")]
#[macro_export]
macro_rules! Macro {
diff --git a/tests/rustdoc-js/non-english-identifier.js b/tests/rustdoc-js/non-english-identifier.js
new file mode 100644
index 0000000000000..1765a69152a8f
--- /dev/null
+++ b/tests/rustdoc-js/non-english-identifier.js
@@ -0,0 +1,163 @@
+const PARSED = [
+ {
+ query: '中文',
+ elems: [{
+ name: "中文",
+ fullPath: ["中文"],
+ pathWithoutLast: [],
+ pathLast: "中文",
+ generics: [],
+ typeFilter: -1,
+ }],
+ returned: [],
+ foundElems: 1,
+ original: "中文",
+ userQuery: "中文",
+ error: null,
+ },
+ {
+ query: '_0Mixed中英文',
+ elems: [{
+ name: "_0mixed中英文",
+ fullPath: ["_0mixed中英文"],
+ pathWithoutLast: [],
+ pathLast: "_0mixed中英文",
+ generics: [],
+ typeFilter: -1,
+ }],
+ foundElems: 1,
+ original: "_0Mixed中英文",
+ returned: [],
+ userQuery: "_0mixed中英文",
+ error: null,
+ },
+ {
+ query: 'my_crate::中文API',
+ elems: [{
+ name: "my_crate::中文api",
+ fullPath: ["my_crate", "中文api"],
+ pathWithoutLast: ["my_crate"],
+ pathLast: "中文api",
+ generics: [],
+ typeFilter: -1,
+ }],
+ foundElems: 1,
+ original: "my_crate::中文API",
+ returned: [],
+ userQuery: "my_crate::中文api",
+ error: null,
+ },
+ {
+ query: '类型A,类型B<约束C>->返回类型<关联类型=路径::约束D>',
+ elems: [{
+ name: "类型a",
+ fullPath: ["类型a"],
+ pathWithoutLast: [],
+ pathLast: "类型a",
+ generics: [],
+ }, {
+ name: "类型b",
+ fullPath: ["类型b"],
+ pathWithoutLast: [],
+ pathLast: "类型b",
+ generics: [{
+ name: "约束c",
+ fullPath: ["约束c"],
+ pathWithoutLast: [],
+ pathLast: "约束c",
+ generics: [],
+ }],
+ }],
+ foundElems: 3,
+ totalElems: 5,
+ literalSearch: true,
+ original: "类型A,类型B<约束C>->返回类型<关联类型=路径::约束D>",
+ returned: [{
+ name: "返回类型",
+ fullPath: ["返回类型"],
+ pathWithoutLast: [],
+ pathLast: "返回类型",
+ generics: [],
+ }],
+ userQuery: "类型a,类型b<约束c>->返回类型<关联类型=路径::约束d>",
+ error: null,
+ },
+ {
+ query: 'my_crate 中文宏!',
+ elems: [{
+ name: "my_crate 中文宏",
+ fullPath: ["my_crate", "中文宏"],
+ pathWithoutLast: ["my_crate"],
+ pathLast: "中文宏",
+ generics: [],
+ typeFilter: 16,
+ }],
+ foundElems: 1,
+ original: "my_crate 中文宏!",
+ returned: [],
+ userQuery: "my_crate 中文宏!",
+ error: null,
+ },
+ {
+ query: '非法符号——',
+ elems: [],
+ foundElems: 0,
+ original: "非法符号——",
+ returned: [],
+ userQuery: "非法符号——",
+ error: "Unexpected `—` after `号` (not a valid identifier)",
+ }
+]
+const EXPECTED = [
+ {
+ query: '加法',
+ others: [
+ {
+ name: "add",
+ path: "non_english_identifier",
+ is_alias: true,
+ alias: "加法",
+ href: "../non_english_identifier/macro.add.html"
+ },
+ {
+ name: "add",
+ path: "non_english_identifier",
+ is_alias: true,
+ alias: "加法",
+ href: "../non_english_identifier/fn.add.html"
+ },
+ {
+ name: "加法",
+ path: "non_english_identifier",
+ href: "../non_english_identifier/trait.加法.html",
+ desc: "Add"
+ },
+ {
+ name: "中文名称的加法宏",
+ path: "non_english_identifier",
+ href: "../non_english_identifier/macro.中文名称的加法宏.html",
+ },
+ {
+ name: "中文名称的加法API",
+ path: "non_english_identifier",
+ href: "../non_english_identifier/fn.中文名称的加法API.html",
+ }],
+ in_args: [{
+ name: "加上",
+ path: "non_english_identifier::加法",
+ href: "../non_english_identifier/trait.加法.html#tymethod.加上",
+ }],
+ returned: [],
+ },
+ { // Extensive type-based search is still buggy, experimental & work-in-progress.
+ query: '可迭代->可选',
+ others: [{
+ name: "总计",
+ path: "non_english_identifier",
+ href: "../non_english_identifier/fn.总计.html",
+ desc: "“sum”"
+ }],
+ in_args: [],
+ returned: [],
+ },
+];
diff --git a/tests/rustdoc-js/non-english-identifier.rs b/tests/rustdoc-js/non-english-identifier.rs
new file mode 100644
index 0000000000000..70b5141472c80
--- /dev/null
+++ b/tests/rustdoc-js/non-english-identifier.rs
@@ -0,0 +1,47 @@
+#[doc(alias = "加法")]
+pub fn add(left: usize, right: usize) -> usize {
+ left + right
+}
+
+pub fn 中文名称的加法API(left: usize, right: usize) -> usize {
+ left + right
+}
+
+#[macro_export]
+macro_rules! 中文名称的加法宏 {
+ ($left:expr, $right:expr) => {
+ ($left) + ($right)
+ };
+}
+
+#[doc(alias = "加法")]
+#[macro_export]
+macro_rules! add {
+ ($left:expr, $right:expr) => {
+ ($left) + ($right)
+ };
+}
+
+/// Add
+pub trait 加法<类型> {
+ type 结果;
+ fn 加上(self, 被加数: 类型) -> Self::结果;
+}
+
+/// IntoIterator
+pub trait 可迭代 {
+ type 项;
+ type 转为迭代器: Iterator<Item = Self::项>;
+ fn 迭代(self) -> Self::转为迭代器;
+}
+
+pub type 可选<类型> = Option<类型>;
+
+/// "sum"
+pub fn 总计<集合, 个体>(容器: 集合) -> 可选<集合::项>
+where
+ 集合: 可迭代<项 = 个体>,
+ 个体: 加法<个体, 结果 = 个体>,
+{
+ 容器.迭代().reduce(|累计值, 当前值| 累计值.加上(当前值))
+}
diff --git a/tests/ui/imports/cycle-import-in-std-1.rs b/tests/ui/imports/cycle-import-in-std-1.rs
new file mode 100644
index 0000000000000..2fa492c155d7a
--- /dev/null
+++ b/tests/ui/imports/cycle-import-in-std-1.rs
@@ -0,0 +1,9 @@
+//@ edition: 2018
+
+// https://github.com/rust-lang/rust/issues/124490
+
+use ops::{self as std};
+//~^ ERROR: unresolved import `ops`
+use std::collections::{self as ops};
+
+fn main() {}
diff --git a/tests/ui/imports/cycle-import-in-std-1.stderr b/tests/ui/imports/cycle-import-in-std-1.stderr
new file mode 100644
index 0000000000000..d4e6f32cc109e
--- /dev/null
+++ b/tests/ui/imports/cycle-import-in-std-1.stderr
@@ -0,0 +1,13 @@
+error[E0432]: unresolved import `ops`
+ --> $DIR/cycle-import-in-std-1.rs:5:11
+ |
+LL | use ops::{self as std};
+ | ^^^^^^^^^^^ no external crate `ops`
+ |
+ = help: consider importing one of these items instead:
+ core::ops
+ std::ops
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0432`.
diff --git a/tests/ui/imports/cycle-import-in-std-2.rs b/tests/ui/imports/cycle-import-in-std-2.rs
new file mode 100644
index 0000000000000..d73c57944bc29
--- /dev/null
+++ b/tests/ui/imports/cycle-import-in-std-2.rs
@@ -0,0 +1,9 @@
+//@ edition: 2018
+
+// https://github.com/rust-lang/rust/issues/125013
+
+use ops::{self as std};
+//~^ ERROR: unresolved import `ops`
+use std::ops::Deref::{self as ops};
+
+fn main() {}
diff --git a/tests/ui/imports/cycle-import-in-std-2.stderr b/tests/ui/imports/cycle-import-in-std-2.stderr
new file mode 100644
index 0000000000000..dc0270dffe4a7
--- /dev/null
+++ b/tests/ui/imports/cycle-import-in-std-2.stderr
@@ -0,0 +1,13 @@
+error[E0432]: unresolved import `ops`
+ --> $DIR/cycle-import-in-std-2.rs:5:11
+ |
+LL | use ops::{self as std};
+ | ^^^^^^^^^^^ no external crate `ops`
+ |
+ = help: consider importing one of these items instead:
+ core::ops
+ std::ops
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0432`.