---

yaml
---
r: 174373
b: refs/heads/master
c: 0478a8c
h: refs/heads/master
i:
  174371: 74b9fb4
v: v3

Author: Oliver 'ker' Schneider

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d727f9910729625039defffd4058b907ca984bb9
+refs/heads/master: 0478a8c1d73ab936bcfb762ce8f31ab9f642f462
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 9006c3c0f14be45da8ffeba43d354d088e366c83
 refs/heads/try: 08f6380a9f0b866796080094f44fe25ea5636547

trunk/src/libserialize/json.rs

@@ -2583,7 +2583,7 @@ mod tests {
     use super::DecoderError::*;
     use super::JsonEvent::*;
     use super::{Json, from_str, DecodeResult, DecoderError, JsonEvent, Parser,
-                StackElement, Stack, Decoder};
+                StackElement, Stack, Decoder, Encoder, EncoderError};
     use std::{i64, u64, f32, f64, io};
     use std::collections::BTreeMap;
     use std::num::Float;
@@ -3892,6 +3892,25 @@ mod tests {
         assert_eq!(None::<int>.to_json(), Null);
     }
 
+    #[test]
+    fn test_encode_hashmap_with_arbitrary_key() {
+        use std::str::from_utf8;
+        use std::io::Writer;
+        use std::collections::HashMap;
+        use std::fmt;
+        #[derive(PartialEq, Eq, Hash, RustcEncodable)]
+        struct ArbitraryType(uint);
+        let mut hm: HashMap<ArbitraryType, bool> = HashMap::new();
+        hm.insert(ArbitraryType(1), true);
+        let mut mem_buf = Vec::new();
+        let mut encoder = Encoder::new(&mut mem_buf as &mut fmt::Writer);
+        let result = hm.encode(&mut encoder);
+        match result.unwrap_err() {
+            EncoderError::BadHashmapKey => (),
+            _ => panic!("expected bad hash map key")
+        }
+    }
+
     #[bench]
     fn bench_streaming_small(b: &mut Bencher) {
         b.iter( || {