Latest rust nightly: Shadowed lifetimes & slice prelude

This is a roll-up of some fixes for the latest nightly.
Namely the `CloneSlicePrelude` no longer exists; and there were many shadowed lifetimes in `buffer.rs` which can be eliminated.