about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-10-01 11:06:38 +0000
committerbors <bors@rust-lang.org>2023-10-01 11:06:38 +0000
commitc16823d757b376f90c5f5cbd542ce83235befbc4 (patch)
tree352da257942bbd2f8faec8bc6f0b99560b2264f6
parent7c3eeb92a5f337be709f5d3f59522db8750a5f2f (diff)
parentbcba369004cbb68d384d42c40eaee9a906b20800 (diff)
downloadrust-c16823d757b376f90c5f5cbd542ce83235befbc4.tar.gz
rust-c16823d757b376f90c5f5cbd542ce83235befbc4.zip
Auto merge of #116311 - matthiaskrgr:rollup-7r5zogb, r=matthiaskrgr
Rollup of 3 pull requests

Successful merges:

 - #116292 (warn if source is not either a git clone or a dist tarball)
 - #116295 (Fix `core::mem::drop` docs inaccuracy)
 - #116299 (Update location of `auxiliary/lint-plugin-test.rs`)

r? `@ghost`
`@rustbot` modify labels: rollup
-rw-r--r--library/core/src/mem/mod.rs2
-rw-r--r--src/bootstrap/bootstrap.py6
-rw-r--r--src/doc/unstable-book/src/language-features/plugin.md2
3 files changed, 8 insertions, 2 deletions
diff --git a/library/core/src/mem/mod.rs b/library/core/src/mem/mod.rs
index d7abc9a0e23..5244e478018 100644
--- a/library/core/src/mem/mod.rs
+++ b/library/core/src/mem/mod.rs
@@ -930,7 +930,7 @@ pub const fn replace<T>(dest: &mut T, src: T) -> T {
 /// This function is not magic; it is literally defined as
 ///
 /// ```
-/// pub fn drop<T>(_x: T) { }
+/// pub fn drop<T>(_x: T) {}
 /// ```
 ///
 /// Because `_x` is moved into the function, it is automatically dropped before
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index fac0cdf2038..4af97b2f466 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -1042,6 +1042,12 @@ def bootstrap(args):
     """Configure, fetch, build and run the initial bootstrap"""
     rust_root = os.path.abspath(os.path.join(__file__, '../../..'))
 
+    if not os.path.exists(os.path.join(rust_root, '.git')) and \
+            os.path.exists(os.path.join(rust_root, '.github')):
+        eprint("warn: Looks like you are trying to bootstrap Rust from a source that is neither a "
+               "git clone nor distributed tarball.\nThis build may fail due to missing submodules "
+               "unless you put them in place manually.")
+
     # Read from `--config`, then `RUST_BOOTSTRAP_CONFIG`, then `./config.toml`,
     # then `config.toml` in the root directory.
     toml_path = args.config or os.getenv('RUST_BOOTSTRAP_CONFIG')
diff --git a/src/doc/unstable-book/src/language-features/plugin.md b/src/doc/unstable-book/src/language-features/plugin.md
index 189cc910a8d..d9421a428f1 100644
--- a/src/doc/unstable-book/src/language-features/plugin.md
+++ b/src/doc/unstable-book/src/language-features/plugin.md
@@ -33,7 +33,7 @@ of a library.
 Plugins can extend [Rust's lint
 infrastructure](../../reference/attributes/diagnostics.md#lint-check-attributes) with
 additional checks for code style, safety, etc. Now let's write a plugin
-[`lint-plugin-test.rs`](https://github.com/rust-lang/rust/blob/master/tests/ui-fulldeps/auxiliary/lint-plugin-test.rs)
+[`lint-plugin-test.rs`](https://github.com/rust-lang/rust/blob/master/tests/ui-fulldeps/plugin/auxiliary/lint-plugin-test.rs)
 that warns about any item named `lintme`.
 
 ```rust,ignore (requires-stage-2)