diff options
| author | bors <bors@rust-lang.org> | 2017-07-24 20:15:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-24 20:15:21 +0000 |
| commit | 598eddf4f785df12e79fba5a996f153dc6fdb7e0 (patch) | |
| tree | 3fb84fd0a941dcfa2aaf1d627259301732b0ec42 /src/librustc_data_structures | |
| parent | b80e946101dd49dd1864b6229f9430c55036c7ce (diff) | |
| parent | 0bb4291295b672d53edf816b5bde2d78c110d654 (diff) | |
| download | rust-598eddf4f785df12e79fba5a996f153dc6fdb7e0.tar.gz rust-598eddf4f785df12e79fba5a996f153dc6fdb7e0.zip | |
Auto merge of #43454 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 11 pull requests - Successful merges: #43297, #43322, #43342, #43361, #43366, #43374, #43379, #43401, #43421, #43428, #43446 - Failed merges:
Diffstat (limited to 'src/librustc_data_structures')
| -rw-r--r-- | src/librustc_data_structures/obligation_forest/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_data_structures/obligation_forest/mod.rs b/src/librustc_data_structures/obligation_forest/mod.rs index 3515e5c5ede..6e70944ce64 100644 --- a/src/librustc_data_structures/obligation_forest/mod.rs +++ b/src/librustc_data_structures/obligation_forest/mod.rs @@ -117,11 +117,11 @@ enum NodeState { /// non-ambiguous result. Pending, - /// This obligation was selected successfuly, but may or + /// This obligation was selected successfully, but may or /// may not have subobligations. Success, - /// This obligation was selected sucessfully, but it has + /// This obligation was selected successfully, but it has /// a pending subobligation. Waiting, |