From 6daea5338511debd17890e14082d6b8a4c00a368 Mon Sep 17 00:00:00 2001
From: Chris Morgan <me@chrismorgan.info>
Date: Thu, 10 Jul 2014 18:11:53 +1000
Subject: [PATCH] Update for upstream changes.

Also change from rlib/dylib to lib (dylib is not necessary and
complicates matters in this new rpath-free world).
---
 Makefile   | 2 +-
 src/lib.rs | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 4050c16..882cd30 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) \
   $(filter $(subst *,%,$2),$d))
 
 SRC := $(call rwildcard,src/,*.rs)
-LIB := target/$(shell rustc --crate-file-name src/lib.rs --crate-type rlib)
+LIB := target/$(shell rustc --print-file-name src/lib.rs)
 ifeq ($(LIB),target/)
 # We may not have rustc or the lib.rs file may be broken.
 # But don't break the rules on that account.
diff --git a/src/lib.rs b/src/lib.rs
index f5ee7b3..1fae987 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,8 +1,7 @@
 //! This crate provides the `AnyMap` type, a safe and convenient store for one value of each type.
 
-#![crate_id = "anymap#0.9.0"]
-#![crate_type = "rlib"]
-#![crate_type = "dylib"]
+#![crate_name = "anymap"]
+#![crate_type = "lib"]
 #![feature(default_type_params)]
 #![warn(unnecessary_qualification, non_uppercase_statics,
         variant_size_difference, managed_heap_memory, unnecessary_typecast,