cargo.bbclass: replace with what was cargo_util.bbclass

The old cargo.bbclass had no users in meta-rust and had lots of
problems (not least of which was lots of duplicated lines with
cargo_util.bbclass).  Delete the old cargo.bbclass and replace it
entirely wiht cargo_util

recipes-devtools/cargo/cargo.inc

@@ -1,4 +1,4 @@
-inherit cargo_util
+inherit cargo
 inherit patch
 inherit rust-installer
 
@@ -94,7 +94,7 @@ do_configure () {
 		${EXTRA_OECONF} \
 		|| die "Could not configure cargo"
 
-	cargo_util_do_configure
+	cargo_do_configure
 }
 
 do_compile () {

recipes-devtools/rust/libstd-rs.bb

@@ -16,7 +16,7 @@ SRC_URI += "\
 DEPENDS += "compiler-rt"
 
 RUSTLIB_DEP = ""
-inherit cargo_util
+inherit cargo
 
 # Needed so cargo can find libbacktrace
 RUSTFLAGS += "-L ${STAGING_LIBDIR}"