diff options
| author | bors <bors@rust-lang.org> | 2021-09-24 01:48:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-09-24 01:48:02 +0000 |
| commit | 293b8f2c11cbec03f0d4daae6b82ed7541ebbf4e (patch) | |
| tree | 8b2059d304cdf68e31a428247287d154f02c75fa /compiler/rustc_infer | |
| parent | 900cf5e8905ba8a2a9c99a1dfc9cb2cf4754d77a (diff) | |
| parent | 1875cecfd46a347dac9c9e23910e4b39be3a9d5f (diff) | |
| download | rust-293b8f2c11cbec03f0d4daae6b82ed7541ebbf4e.tar.gz rust-293b8f2c11cbec03f0d4daae6b82ed7541ebbf4e.zip | |
Auto merge of #89211 - workingjubilee:rollup-fj4eduk, r=workingjubilee
Rollup of 7 pull requests Successful merges: - #88612 (Add a better error message for #39364) - #89023 (Resolve issue : Somewhat confusing error with extended_key_value_attributes) - #89148 (Suggest `_` in turbofish if param will be inferred from fn argument) - #89171 (Run `no_core` rustdoc tests only on Linux) - #89176 (Change singular to plural) - #89184 (Temporarily rename int_roundings functions to avoid conflicts) - #89200 (Fix typo) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_infer')
| -rw-r--r-- | compiler/rustc_infer/src/infer/error_reporting/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_infer/src/infer/error_reporting/mod.rs b/compiler/rustc_infer/src/infer/error_reporting/mod.rs index b8089b2499b..d9b7022f03a 100644 --- a/compiler/rustc_infer/src/infer/error_reporting/mod.rs +++ b/compiler/rustc_infer/src/infer/error_reporting/mod.rs @@ -7,7 +7,7 @@ //! inference graph arose so that we can explain to the user what gave //! rise to a particular error. //! -//! The basis of the system are the "origin" types. An "origin" is the +//! The system is based around a set of "origin" types. An "origin" is the //! reason that a constraint or inference variable arose. There are //! different "origin" enums for different kinds of constraints/variables //! (e.g., `TypeOrigin`, `RegionVariableOrigin`). An origin always has |