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

@@ -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.

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,