diff options
| author | bors <bors@rust-lang.org> | 2017-09-01 16:39:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-09-01 16:39:31 +0000 |
| commit | f861b6ee46465097eec266c160ac53e230df7cf0 (patch) | |
| tree | 405f0e674dbf26844264142051397b7fcee53d5f /src/bootstrap | |
| parent | ed532c0d933aaae45e6804efc5936bea078bbaad (diff) | |
| parent | 271c63c18925725a9451c3e769e327f5c5a1167c (diff) | |
| download | rust-f861b6ee46465097eec266c160ac53e230df7cf0.tar.gz rust-f861b6ee46465097eec266c160ac53e230df7cf0.zip | |
Auto merge of #44154 - alexcrichton:bump-bootstrap, r=Mark-Simulacrum
Bump to 1.22.0 and update boostrap compiler Time to get a new nightly!
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/channel.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/util.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs index 9c1ae83d382..6ed504dfe74 100644 --- a/src/bootstrap/channel.rs +++ b/src/bootstrap/channel.rs @@ -24,7 +24,7 @@ use Build; use config::Config; // The version number -pub const CFG_RELEASE_NUM: &str = "1.21.0"; +pub const CFG_RELEASE_NUM: &str = "1.22.0"; // An optional number to put after the label, e.g. '.2' -> '-beta.2' // Be sure to make this starts with a dot to conform to semver pre-release diff --git a/src/bootstrap/util.rs b/src/bootstrap/util.rs index 092fb04637b..234d937823f 100644 --- a/src/bootstrap/util.rs +++ b/src/bootstrap/util.rs @@ -279,7 +279,7 @@ pub fn symlink_dir(src: &Path, dest: &Path) -> io::Result<()> { ptr::null_mut()); let mut data = [0u8; MAXIMUM_REPARSE_DATA_BUFFER_SIZE]; - let mut db = data.as_mut_ptr() + let db = data.as_mut_ptr() as *mut REPARSE_MOUNTPOINT_DATA_BUFFER; let buf = &mut (*db).ReparseTarget as *mut _; let mut i = 0; |
