Skip to content

Commit c16823d

Browse files
committed
Auto merge of rust-lang#116311 - matthiaskrgr:rollup-7r5zogb, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - rust-lang#116292 (warn if source is not either a git clone or a dist tarball) - rust-lang#116295 (Fix `core::mem::drop` docs inaccuracy) - rust-lang#116299 (Update location of `auxiliary/lint-plugin-test.rs`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 7c3eeb9 + bcba369 commit c16823d

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

library/core/src/mem/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,7 @@ pub const fn replace<T>(dest: &mut T, src: T) -> T {
930930
/// This function is not magic; it is literally defined as
931931
///
932932
/// ```
933-
/// pub fn drop<T>(_x: T) { }
933+
/// pub fn drop<T>(_x: T) {}
934934
/// ```
935935
///
936936
/// Because `_x` is moved into the function, it is automatically dropped before

src/bootstrap/bootstrap.py

+6
Original file line numberDiff line numberDiff line change
@@ -1042,6 +1042,12 @@ def bootstrap(args):
10421042
"""Configure, fetch, build and run the initial bootstrap"""
10431043
rust_root = os.path.abspath(os.path.join(__file__, '../../..'))
10441044

1045+
if not os.path.exists(os.path.join(rust_root, '.git')) and \
1046+
os.path.exists(os.path.join(rust_root, '.github')):
1047+
eprint("warn: Looks like you are trying to bootstrap Rust from a source that is neither a "
1048+
"git clone nor distributed tarball.\nThis build may fail due to missing submodules "
1049+
"unless you put them in place manually.")
1050+
10451051
# Read from `--config`, then `RUST_BOOTSTRAP_CONFIG`, then `./config.toml`,
10461052
# then `config.toml` in the root directory.
10471053
toml_path = args.config or os.getenv('RUST_BOOTSTRAP_CONFIG')

src/doc/unstable-book/src/language-features/plugin.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ of a library.
3333
Plugins can extend [Rust's lint
3434
infrastructure](../../reference/attributes/diagnostics.md#lint-check-attributes) with
3535
additional checks for code style, safety, etc. Now let's write a plugin
36-
[`lint-plugin-test.rs`](https://github.com/rust-lang/rust/blob/master/tests/ui-fulldeps/auxiliary/lint-plugin-test.rs)
36+
[`lint-plugin-test.rs`](https://github.com/rust-lang/rust/blob/master/tests/ui-fulldeps/plugin/auxiliary/lint-plugin-test.rs)
3737
that warns about any item named `lintme`.
3838

3939
```rust,ignore (requires-stage-2)

0 commit comments

Comments
 (0)