diff options
| author | bors <bors@rust-lang.org> | 2017-08-29 06:18:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-08-29 06:18:23 +0000 |
| commit | 6f82dea299e7a8c4aa149196545917043f66af2f (patch) | |
| tree | ec8cc80ba03809e8a68cea0b605645f6a49cab6e /src/librustc_data_structures | |
| parent | d2d50691aadfb9e25c8c3d9a1d71a8c79607c5b2 (diff) | |
| parent | 0b72497307207995e22237e4523be24e60f0d3c1 (diff) | |
| download | rust-6f82dea299e7a8c4aa149196545917043f66af2f.tar.gz rust-6f82dea299e7a8c4aa149196545917043f66af2f.zip | |
Auto merge of #44059 - oli-obk:ok_suggestion, r=nikomatsakis
Suggest `Ok(())` when encountering `Result::<(), E>::Ok()`
Diffstat (limited to 'src/librustc_data_structures')
| -rw-r--r-- | src/librustc_data_structures/unify/mod.rs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/librustc_data_structures/unify/mod.rs b/src/librustc_data_structures/unify/mod.rs index 7853bf9478a..5411ae0257a 100644 --- a/src/librustc_data_structures/unify/mod.rs +++ b/src/librustc_data_structures/unify/mod.rs @@ -119,10 +119,10 @@ impl<K: UnifyKey> VarValue<K> { } } -// We can't use V:LatticeValue, much as I would like to, -// because frequently the pattern is that V=Option<U> for some -// other type parameter U, and we have no way to say -// Option<U>:LatticeValue. +/// We can't use V:LatticeValue, much as I would like to, +/// because frequently the pattern is that V=Option<U> for some +/// other type parameter U, and we have no way to say +/// Option<U>:LatticeValue. impl<K: UnifyKey> UnificationTable<K> { pub fn new() -> UnificationTable<K> { @@ -249,7 +249,7 @@ impl<K: UnifyKey> sv::SnapshotVecDelegate for Delegate<K> { fn reverse(_: &mut Vec<VarValue<K>>, _: ()) {} } -// # Base union-find algorithm, where we are just making sets +/// # Base union-find algorithm, where we are just making sets impl<'tcx, K: UnifyKey> UnificationTable<K> where K::Value: Combine @@ -281,11 +281,11 @@ impl<'tcx, K: UnifyKey> UnificationTable<K> } } -// # Non-subtyping unification -// -// Code to handle keys which carry a value, like ints, -// floats---anything that doesn't have a subtyping relationship we -// need to worry about. +/// # Non-subtyping unification +/// +/// Code to handle keys which carry a value, like ints, +/// floats---anything that doesn't have a subtyping relationship we +/// need to worry about. impl<'tcx, K, V> UnificationTable<K> where K: UnifyKey<Value = Option<V>>, |
