Merge type_span and type_def, and ditto with value_span and value_def
auto merge of #6501 : june0cho/rust/incoming, r=graydon

Fix #3783.