Skip to content

Commit d592fa4

Browse files
committed
Auto merge of #152506 - Urgau:rollup-MlGAszj, r=Urgau
Rollup of 7 pull requests Successful merges: - rust-lang/rust#152505 (Sync relnotes for stable 1.93.1) - rust-lang/rust#137487 (Stabilize `assert_matches`) - rust-lang/rust#152281 (borrowck: suggest `&mut *x` for pattern reborrows) - rust-lang/rust#151142 (Support ADT types in type info reflection) - rust-lang/rust#152477 (rustc-dev-guide subtree update) - rust-lang/rust#152488 (allow `deprecated(since = "CURRENT_RUSTC_VERSION")`) - rust-lang/rust#152491 (Remove unused `fluent-syntax` dependency from tidy)
2 parents 7593da7 + 87c3138 commit d592fa4

40 files changed

+285
-210
lines changed

ci/date-check/src/main.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,9 @@ fn main() {
163163
}
164164
}
165165
println!();
166+
167+
println!("@rustbot label +C-date-reference-triage +E-easy +E-help-wanted");
168+
println!();
166169
}
167170
}
168171

examples/rustc-interface-example.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,11 @@ fn main() {
2828
println!("{HELLO}");
2929
}
3030
"#
31-
.into(),
31+
.into(),
3232
},
33-
output_dir: None, // Option<PathBuf>
34-
output_file: None, // Option<PathBuf>
35-
file_loader: None, // Option<Box<dyn FileLoader + Send + Sync>>
36-
locale_resources: rustc_driver::DEFAULT_LOCALE_RESOURCES.to_owned(),
33+
output_dir: None, // Option<PathBuf>
34+
output_file: None, // Option<PathBuf>
35+
file_loader: None, // Option<Box<dyn FileLoader + Send + Sync>>
3736
lint_caps: FxHashMap::default(), // FxHashMap<lint::LintId, lint::Level>
3837
// This is a callback from the driver that is called when [`ParseSess`] is created.
3938
psess_created: None, //Option<Box<dyn FnOnce(&mut ParseSess) + Send>>
@@ -73,4 +72,4 @@ fn main() {
7372
}
7473
});
7574
});
76-
}
75+
}

examples/rustc-interface-getting-diagnostics.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,13 @@ fn main() {
5959
let x: &str = 1;
6060
}
6161
"
62-
.into(),
62+
.into(),
6363
},
6464
crate_cfg: Vec::new(),
6565
crate_check_cfg: Vec::new(),
6666
output_dir: None,
6767
output_file: None,
6868
file_loader: None,
69-
locale_resources: rustc_driver::DEFAULT_LOCALE_RESOURCES.to_owned(),
7069
lint_caps: rustc_hash::FxHashMap::default(),
7170
psess_created: Some(Box::new(|parse_sess| {
7271
parse_sess.dcx().set_emitter(Box::new(DebugEmitter {
@@ -98,4 +97,4 @@ fn main() {
9897
buffer.lock().unwrap().iter().for_each(|diagnostic| {
9998
println!("{diagnostic:#?}");
10099
});
101-
}
100+
}

src/SUMMARY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
- [`#[test]` implementation](./test-implementation.md)
125125
- [Panic implementation](./panic-implementation.md)
126126
- [AST validation](./ast-validation.md)
127-
- [Feature gate checking](./feature-gate-ck.md)
127+
- [Feature gate checking](./feature-gate-check.md)
128128
- [Lang Items](./lang-items.md)
129129
- [The HIR (High-level IR)](./hir.md)
130130
- [Lowering AST to HIR](./hir/lowering.md)

src/about-this-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ There are several parts to this guide:
1010
about building, debugging, profiling, etc.
1111
1. [Contributing to Rust][p2]:
1212
Contains information that should be useful no matter how you are contributing,
13-
about procedures for contribution, using git and Github, stabilizing features, etc.
13+
about procedures for contribution, using git and GitHub, stabilizing features, etc.
1414
1. [Bootstrapping][p3]:
1515
Describes how the Rust compiler builds itself using previous versions, including
1616
an introduction to the bootstrap process and debugging methods.

src/building/bootstrapping/what-bootstrapping-does.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ This is also where `--keep-stage 1 library/std` comes into play. Since most
243243
changes to the compiler don't actually change the ABI, once you've produced a
244244
`std` in `stage1`, you can probably just reuse it with a different compiler. If
245245
the ABI hasn't changed, you're good to go, no need to spend time recompiling
246-
that `std`. The flag `--keep-stage` simply instructs the build script to assumes
246+
that `std`. The flag `--keep-stage` simply instructs the build script to assume
247247
the previous compile is fine and copies those artifacts into the appropriate
248248
place, skipping the `cargo` invocation.
249249

@@ -342,7 +342,7 @@ This flag has the following effects:
342342

343343
Code which does not use `-Z force-unstable-if-unmarked` should include the
344344
`#![feature(rustc_private)]` crate attribute to access these forced-unstable
345-
crates. This is needed for things which link `rustc` its self, such as `MIRI` or
345+
crates. This is needed for things which link `rustc` itself, such as `Miri` or
346346
`clippy`.
347347

348348
You can find more discussion about sysroots in:

src/building/suggested.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ You can also include extensions within extensions recursively.
5656
**Note:** In the `include` field, the overriding logic follows a right-to-left order.
5757
For example,
5858
in `include = ["a.toml", "b.toml"]`, extension `b.toml` overrides `a.toml`.
59-
Also, parent extensions always overrides the inner ones.
59+
Also, parent extensions always override the inner ones.
6060

6161
## Configuring `rust-analyzer` for `rustc`
6262

@@ -426,7 +426,7 @@ You can then use that rust2 folder as a separate workspace for modifying and bui
426426

427427
Several nix configurations are defined in `src/tools/nix-dev-shell`.
428428

429-
If you're using direnv, you can create a symbol link to `src/tools/nix-dev-shell/envrc-flake` or `src/tools/nix-dev-shell/envrc-shell`
429+
If you're using direnv, you can create a symbolic link to `src/tools/nix-dev-shell/envrc-flake` or `src/tools/nix-dev-shell/envrc-shell`
430430

431431
```bash
432432
ln -s ./src/tools/nix-dev-shell/envrc-flake ./.envrc # Use flake
@@ -436,6 +436,12 @@ or
436436
ln -s ./src/tools/nix-dev-shell/envrc-shell ./.envrc # Use nix-shell
437437
```
438438

439+
If you're using the flake, make sure to also update it with the following command:
440+
441+
```
442+
nix flake update --flake ./src/tools/nix-dev-shell
443+
```
444+
439445
### Note
440446

441447
Note that when using nix on a not-NixOS distribution, it may be necessary to set

src/const-generics.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ In some sense the desugarings from the previous examples are to:
6161
struct Foo<const N: usize>;
6262
type Alias = [u8; 1 + 1];
6363

64-
// sort-of desugars to psuedo-rust:
64+
// sort-of desugars to pseudo-rust:
6565
struct Foo<const N: usize>;
6666

6767
const ANON = 1 + 1;
@@ -178,7 +178,7 @@ To check this we have [`ClauseKind::ConstArgHasType(ty::Const, Ty)`][const_arg_h
178178
```rust
179179
fn foo<const N: usize>() {}
180180

181-
// desugars to in psuedo-rust
181+
// desugars to in pseudo-rust
182182

183183
fn foo<const N>()
184184
where

src/contributing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ When you resolve them, you should use `@rustbot` to mark it as `S-waiting-on-rev
324324
GitHub allows [closing issues using keywords][closing-keywords].
325325
This feature should be used to keep the issue tracker tidy.
326326
However, it is generally preferred
327-
to put the "closes #123" text in the PR description rather than the issue commit;
327+
to put the "closes #123" text in the PR description rather than the commit message;
328328
particularly during rebasing, citing the issue number in the commit can "spam"
329329
the issue in question.
330330

src/crates-io.md

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,13 @@
11
# crates.io dependencies
22

33
The Rust compiler supports building with some dependencies from `crates.io`.
4-
Examples are `log` and `env_logger`.
54

6-
In general,
7-
you should avoid adding dependencies to the compiler for several reasons:
8-
9-
- The dependency may not be of high quality or well-maintained.
10-
- The dependency may not be using a compatible license.
11-
- The dependency may have transitive dependencies that have one of the above
12-
problems.
13-
14-
<!-- date-check: Aug 2025 -->
15-
Note that there is no official policy for vetting new dependencies to the compiler.
16-
Decisions are made on a case-by-case basis, during code review.
5+
Rust Forge has [official policy for vetting new dependencies].
176

187
## Permitted dependencies
198

20-
The `tidy` tool has [a list of crates that are allowed]. To add a
21-
dependency that is not already in the compiler, you will need to add it to the list.
9+
The `tidy` tool has [a list of crates that are allowed].
10+
To add a dependency that is not already in the compiler, you will need to add it to the list.
2211

2312
[a list of crates that are allowed]: https://github.com/rust-lang/rust/blob/9d1b2106e23b1abd32fce1f17267604a5102f57a/src/tools/tidy/src/deps.rs#L73
13+
[official policy for vetting new dependencies]: https://forge.rust-lang.org/compiler/third-party-out-of-tree#third-party-crates

0 commit comments

Comments
 (0)