Skip to content

Commit ad89f2d

Browse files
authored
Rollup merge of rust-lang#145743 - xihuwenhua:master, r=petrochenkov
doc: fix some typos in comment fix some typos in comment
2 parents 5e1f11e + e1d4f09 commit ad89f2d

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/doc/rustc-dev-guide/src/autodiff/internals.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fn main() {
1717

1818
The detailed documentation for the `std::autodiff` module is available at [std::autodiff](https://doc.rust-lang.org/std/autodiff/index.html).
1919

20-
Differentiable programing is used in various fields like numerical computing, [solid mechanics][ratel], [computational chemistry][molpipx], [fluid dynamics][waterlily] or for Neural Network training via Backpropagation, [ODE solver][diffsol], [differentiable rendering][libigl], [quantum computing][catalyst], and climate simulations.
20+
Differentiable programming is used in various fields like numerical computing, [solid mechanics][ratel], [computational chemistry][molpipx], [fluid dynamics][waterlily] or for Neural Network training via Backpropagation, [ODE solver][diffsol], [differentiable rendering][libigl], [quantum computing][catalyst], and climate simulations.
2121

2222
[ratel]: https://gitlab.com/micromorph/ratel
2323
[molpipx]: https://arxiv.org/abs/2411.17011v

src/doc/rustc-dev-guide/src/solve/candidate-preference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ fn overflow<T: Trait>() {
9595
```
9696

9797
This preference causes a lot of issues. See [#24066]. Most of the
98-
issues are caused by prefering where-bounds over impls even if the where-bound guides type inference:
98+
issues are caused by preferring where-bounds over impls even if the where-bound guides type inference:
9999
```rust
100100
trait Trait<T> {
101101
fn call_me(&self, x: T) {}

src/doc/rustc/src/platform-support/wasm32-wali-linux.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ This target is cross-compiled and requires an installation of the [WALI compiler
3131
> **Note**: Users can expect that new enabled-by-default Wasm features for LLVM are transitively incorporatable into this target -- see [wasm32-unknown-unknown](wasm32-unknown-unknown.md) for detailed information on WebAssembly features.
3232
3333

34-
> **Note**: The WALI ABI is similar to default Clang wasm32 ABIs but *not identical*. The primary difference is 64-bit `long` types as opposed to 32-bit for wasm32. This is required to mantain minimum source code changes for 64-bit host platforms currently supported. This may change in the future as the spec evolves.
34+
> **Note**: The WALI ABI is similar to default Clang wasm32 ABIs but *not identical*. The primary difference is 64-bit `long` types as opposed to 32-bit for wasm32. This is required to maintain minimum source code changes for 64-bit host platforms currently supported. This may change in the future as the spec evolves.
3535
3636
### Execution
3737
Running generated WALI binaries also requires a supported compliant engine implementation -- a working implementation in the [WebAssembly Micro-Runtime (WAMR)](https://github.com/arjunr2/WALI) is included in the repo.

src/doc/unstable-book/src/compiler-flags/randomize-layout.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The tracking issue for this feature is: [#106764](https://github.com/rust-lang/r
77
The `-Zrandomize-layout` flag changes the layout algorithm for `repr(Rust)` types defined in the current crate from its normal
88
optimization goals to pseudorandomly rearranging fields within the degrees of freedom provided by the largely unspecified
99
default representation. This also affects type sizes and padding.
10-
Downstream intantiations of generic types defined in a crate with randomization enabled will also be randomized.
10+
Downstream instantiations of generic types defined in a crate with randomization enabled will also be randomized.
1111

1212
It can be used to find unsafe code that accidentally relies on unspecified behavior.
1313

0 commit comments

Comments
 (0)