Really though, rap tends to be more rhythmic while hip-hop is more pop and dance. Hip-hop is multi-instrumental as well.

Rap: Nas, Eminem

Hip-hop: Jurassic 5, De La Soul

Also, hip-hop is a lifestyle which includes DJing, breakdancing, rapping, etc...but I'm separating the music end.