---

catamorphism · catamorphism · commit b00ce580905f · 2012-12-14T15:42:34.000-08:00
yaml --- r: 36731 b: refs/heads/try2 c: 47faeb9 h: refs/heads/master i: 36729: b4d9024 36727: 6c5a449 v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 0afe0027574cdaa65e3d3947eef976ac84d2cf40
+refs/heads/try2: 47faeb9228f10717de6879c6474cdcf988a9f316
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
diff --git a/branches/try2/doc/rust.md b/branches/try2/doc/rust.md
@@ -752,6 +752,10 @@ mod math {
 }
 ~~~~~~~~
 
+Modules and types share the same namespace.
+Declaring a named type that has the same name as a module in scope is forbidden:
+that is, a type definition, trait, struct, enumeration, or type parameter
+can't shadow the name of a module in scope, or vice versa.
 
 #### View items
 

Original file line number	Diff line number	Diff line change
`@@ -752,6 +752,10 @@ mod math {`
`752`	`752`	`}`
`753`	`753`	`~~~~~~~~`
`754`	`754`
	`755`	`+Modules and types share the same namespace.`
	`756`	`+Declaring a named type that has the same name as a module in scope is forbidden:`
	`757`	`+that is, a type definition, trait, struct, enumeration, or type parameter`
	`758`	`+can't shadow the name of a module in scope, or vice versa.`
`755`	`759`
`756`	`760`	`#### View items`
`757`	`761`