Skip to content

Commit 7bbd20e

Browse files
committed
---
yaml --- r: 235728 b: refs/heads/stable c: 75da81e h: refs/heads/master v: v3
1 parent e9bd2c9 commit 7bbd20e

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: b325e4f28e0735bb951bdf9f1db1206bd3ee715b
32+
refs/heads/stable: 75da81e78231a6fb5d90b3918bebe867249eb14c
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
3535
refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/libcore/intrinsics.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,14 @@ extern "rust-intrinsic" {
184184
/// elements.
185185
pub fn size_of<T>() -> usize;
186186

187+
#[cfg(not(stage0))]
188+
/// Moves a value to an uninitialized memory location.
189+
///
190+
/// Drop glue is not run on the destination.
191+
pub fn move_val_init<T>(dst: *mut T, src: T);
192+
193+
// SNAP ba0e1cd
194+
#[cfg(stage0)]
187195
/// Moves a value to an uninitialized memory location.
188196
///
189197
/// Drop glue is not run on the destination.

branches/stable/src/librustc_typeck/check/mod.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4894,9 +4894,7 @@ pub fn check_intrinsic_type(ccx: &CrateCtxt, it: &ast::ForeignItem) {
48944894
"move_val_init" => {
48954895
(1,
48964896
vec!(
4897-
tcx.mk_mut_ref(tcx.mk_region(ty::ReLateBound(ty::DebruijnIndex::new(1),
4898-
ty::BrAnon(0))),
4899-
param(ccx, 0)),
4897+
tcx.mk_mut_ptr(param(ccx, 0)),
49004898
param(ccx, 0)
49014899
),
49024900
tcx.mk_nil())

0 commit comments

Comments
 (0)