Rollup of 3 pull requests

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

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')

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:/rust-lang/rust/blob/master/tests/ui-fulldeps/auxiliary/lint-plugin-test.rs)
+[`lint-plugin-test.rs`](https:/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)