---

alexcrichton · alexcrichton · commit af1d5fb9094b · 2014-06-13T13:53:34.000-07:00
yaml --- r: 152498 b: refs/heads/try2 c: b612ae9 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 00e1a6923773500f0d5b9bad64d05eb5d4a24c53
+refs/heads/try2: b612ae9edea26cb8704363c47a66d583b644ad09
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/libcore/any.rs b/branches/try2/src/libcore/any.rs
@@ -263,6 +263,14 @@ mod tests {
         let s = format!("{}", b);
         assert_eq!(s.as_slice(), "&Any");
     }
+
+    #[test]
+    fn any_fixed_vec() {
+        let test = [0u, ..8];
+        let test = &test as &Any;
+        assert!(test.is::<[uint, ..8]>());
+        assert!(!test.is::<[uint, ..10]>());
+    }
 }
 
 #[cfg(test)]
diff --git a/branches/try2/src/librustc/middle/ty.rs b/branches/try2/src/librustc/middle/ty.rs
@@ -4514,9 +4514,10 @@ pub fn hash_crate_independent(tcx: &ctxt, t: t, svh: &Svh) -> u64 {
             ty_uniq(_) => {
                 byte!(10);
             }
-            ty_vec(m, Some(_)) => {
+            ty_vec(m, Some(n)) => {
                 byte!(11);
                 mt(&mut state, m);
+                n.hash(&mut state);
                 1u8.hash(&mut state);
             }
             ty_vec(m, None) => {

Original file line number	Diff line number	Diff line change
`@@ -263,6 +263,14 @@ mod tests {`
`263`	`263`	`let s = format!("{}", b);`
`264`	`264`	`assert_eq!(s.as_slice(), "&Any");`
`265`	`265`	`}`
	`266`	`+`
	`267`	`+ #[test]`
	`268`	`+ fn any_fixed_vec() {`
	`269`	`+ let test = [0u, ..8];`
	`270`	`+ let test = &test as &Any;`
	`271`	`+ assert!(test.is::<[uint, ..8]>());`
	`272`	`+ assert!(!test.is::<[uint, ..10]>());`
	`273`	`+ }`
`266`	`274`	`}`
`267`	`275`
`268`	`276`	`#[cfg(test)]`
Original file line number	Diff line number	Diff line change
`@@ -4514,9 +4514,10 @@ pub fn hash_crate_independent(tcx: &ctxt, t: t, svh: &Svh) -> u64 {`
`4514`	`4514`	`ty_uniq(_) => {`
`4515`	`4515`	`byte!(10);`
`4516`	`4516`	`}`
`4517`		`- ty_vec(m, Some(_)) => {`
	`4517`	`+ ty_vec(m, Some(n)) => {`
`4518`	`4518`	`byte!(11);`
`4519`	`4519`	`mt(&mut state, m);`
	`4520`	`+ n.hash(&mut state);`
`4520`	`4521`	`1u8.hash(&mut state);`
`4521`	`4522`	`}`
`4522`	`4523`	`ty_vec(m, None) => {`