Merge pull request #1263 from funkill/traits-fixes

Move chapters from folder "traits" to "trait"
rust-lang · Sep 20, 2019 · 1f5e21a · 1f5e21a
2 parents 4a7c70e + 4acc3eb
commit 1f5e21a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/src/SUMMARY.md b/src/SUMMARY.md
@@ -139,8 +139,8 @@
     - [Iterators](trait/iter.md)
     - [`impl Trait`](trait/impl_trait.md)
     - [Clone](trait/clone.md)
-    - [Supertraits](traits/supertraits.md)
-    - [Disambiguating overlapping traits](traits/disambiguating.md)
+    - [Supertraits](trait/supertraits.md)
+    - [Disambiguating overlapping traits](trait/disambiguating.md)
 
 - [macro_rules!](macros.md)
     - [Syntax](macros/syntax.md)

diff --git a/src/traits/disambiguating.md → src/trait/disambiguating.md b/src/traits/disambiguating.md → src/trait/disambiguating.md
diff --git a/src/traits/supertraits.md → src/trait/supertraits.md b/src/traits/supertraits.md → src/trait/supertraits.md