From: bors <bors@rust-lang.org>
Date: Thu, 3 May 2018 19:39:24 +0000 (+0000)
Subject: Auto merge of #5472 - alexcrichton:rename-rust, r=matklad
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~1^2~18
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0dd53841d30816ec0d79d879de71d7adc360bdc5;p=cargo.git

Auto merge of #5472 - alexcrichton:rename-rust, r=matklad

Rename the `rust` manifest key to `edition`

This'll hopefully jive better with the terminology of "edition" throughout the
rest of Rust!
---

0dd53841d30816ec0d79d879de71d7adc360bdc5