Skip to content

Commit b8afb31

Browse files
llogiqllogiq
committed
---
yaml --- r: 275261 b: refs/heads/stable c: d315dc6 h: refs/heads/master i: 275259: 2ab58bc
1 parent c64d951 commit b8afb31

File tree

17 files changed

+48
-35
lines changed

17 files changed

+48
-35
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: f1e191c0b959111aef19f3aa06b7f1743419470c
32+
refs/heads/stable: d315dc6542f638677bbd250a4d8e14e38c1ece06
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/num/flt2dec/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ impl<'a> Part<'a> {
210210
}
211211
}
212212
Part::Copy(buf) => {
213-
out[..buf.len()].copy_from_slice(buf);
213+
out[..buf.len()].clone_from_slice(buf);
214214
}
215215
}
216216
Some(len)
@@ -245,7 +245,7 @@ impl<'a> Formatted<'a> {
245245
/// (It may still leave partially written bytes in the buffer; do not rely on that.)
246246
pub fn write(&self, out: &mut [u8]) -> Option<usize> {
247247
if out.len() < self.sign.len() { return None; }
248-
out[..self.sign.len()].copy_from_slice(self.sign);
248+
out[..self.sign.len()].clone_from_slice(self.sign);
249249

250250
let mut written = self.sign.len();
251251
for part in self.parts {

‎branches/stable/src/libcoretest/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#![feature(box_syntax)]
1616
#![feature(cell_extras)]
1717
#![feature(const_fn)]
18-
#![feature(copy_from_slice)]
1918
#![feature(core_float)]
2019
#![feature(core_private_bignum)]
2120
#![feature(core_private_diy_float)]

‎branches/stable/src/libcoretest/num/flt2dec/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ fn check_exact<F, T>(mut f: F, v: T, vstr: &str, expected: &[u8], expectedk: i16
100100

101101
// check significant digits
102102
for i in 1..cut.unwrap_or(expected.len() - 1) {
103-
expected_[..i].copy_from_slice(&expected[..i]);
103+
expected_[..i].clone_from_slice(&expected[..i]);
104104
let mut expectedk_ = expectedk;
105105
if expected[i] >= b'5' {
106106
// check if this is a rounding-to-even case.
@@ -147,7 +147,7 @@ fn check_exact<F, T>(mut f: F, v: T, vstr: &str, expected: &[u8], expectedk: i16
147147
// check infinite zero digits
148148
if let Some(cut) = cut {
149149
for i in cut..expected.len()-1 {
150-
expected_[..cut].copy_from_slice(&expected[..cut]);
150+
expected_[..cut].clone_from_slice(&expected[..cut]);
151151
for c in &mut expected_[cut..i] { *c = b'0'; }
152152

153153
try_exact!(f(&decoded) => &mut buf, &expected_[..i], expectedk;

‎branches/stable/src/librbml/lib.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@
122122
test(attr(deny(warnings))))]
123123
#![cfg_attr(not(stage0), deny(warnings))]
124124

125-
#![feature(copy_from_slice)]
126125
#![feature(rustc_private)]
127126
#![feature(staged_api)]
128127

@@ -520,7 +519,7 @@ pub mod reader {
520519
// of the page and segfault.
521520

522521
let mut b = [0; 8];
523-
b.copy_from_slice(&d.data[d.end - 8..d.end]);
522+
b.clone_from_slice(&d.data[d.end - 8..d.end]);
524523
let data = unsafe { (*(b.as_ptr() as *const u64)).to_be() };
525524
let len = d.end - d.start;
526525
if len < 8 {
@@ -1044,7 +1043,7 @@ pub mod writer {
10441043
{
10451044
let last_size_pos = last_size_pos as usize;
10461045
let data = &self.writer.get_ref()[last_size_pos + 4..cur_pos as usize];
1047-
buf[..size].copy_from_slice(data);
1046+
buf[..size].clone_from_slice(data);
10481047
}
10491048

10501049
// overwrite the size and data and continue

‎branches/stable/src/librustc/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#![feature(cell_extras)]
3030
#![feature(collections)]
3131
#![feature(const_fn)]
32-
#![feature(copy_from_slice)]
3332
#![feature(enumset)]
3433
#![feature(iter_arith)]
3534
#![feature(libc)]

‎branches/stable/src/librustc/lint/context.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,7 @@ impl<'a, 'tcx, 'v> hir_visit::Visitor<'v> for LateContext<'a, 'tcx> {
766766
self.with_lint_attrs(&it.attrs, |cx| {
767767
run_lints!(cx, check_foreign_item, late_passes, it);
768768
hir_visit::walk_foreign_item(cx, it);
769+
run_lints!(cx, check_foreign_item_post, late_passes, it);
769770
})
770771
}
771772

@@ -795,6 +796,7 @@ impl<'a, 'tcx, 'v> hir_visit::Visitor<'v> for LateContext<'a, 'tcx> {
795796
body: &'v hir::Block, span: Span, id: ast::NodeId) {
796797
run_lints!(self, check_fn, late_passes, fk, decl, body, span, id);
797798
hir_visit::walk_fn(self, fk, decl, body, span);
799+
run_lints!(self, check_fn_post, late_passes, fk, decl, body, span, id);
798800
}
799801

800802
fn visit_variant_data(&mut self,
@@ -835,6 +837,7 @@ impl<'a, 'tcx, 'v> hir_visit::Visitor<'v> for LateContext<'a, 'tcx> {
835837
fn visit_mod(&mut self, m: &hir::Mod, s: Span, n: ast::NodeId) {
836838
run_lints!(self, check_mod, late_passes, m, s, n);
837839
hir_visit::walk_mod(self, m);
840+
run_lints!(self, check_mod_post, late_passes, m, s, n);
838841
}
839842

840843
fn visit_local(&mut self, l: &hir::Local) {
@@ -874,6 +877,7 @@ impl<'a, 'tcx, 'v> hir_visit::Visitor<'v> for LateContext<'a, 'tcx> {
874877
run_lints!(cx, check_trait_item, late_passes, trait_item);
875878
cx.visit_ids(|v| v.visit_trait_item(trait_item));
876879
hir_visit::walk_trait_item(cx, trait_item);
880+
run_lints!(cx, check_trait_item_post, late_passes, trait_item);
877881
});
878882
}
879883

@@ -882,6 +886,7 @@ impl<'a, 'tcx, 'v> hir_visit::Visitor<'v> for LateContext<'a, 'tcx> {
882886
run_lints!(cx, check_impl_item, late_passes, impl_item);
883887
cx.visit_ids(|v| v.visit_impl_item(impl_item));
884888
hir_visit::walk_impl_item(cx, impl_item);
889+
run_lints!(cx, check_impl_item_post, late_passes, impl_item);
885890
});
886891
}
887892

@@ -928,6 +933,7 @@ impl<'a, 'v> ast_visit::Visitor<'v> for EarlyContext<'a> {
928933
self.with_lint_attrs(&it.attrs, |cx| {
929934
run_lints!(cx, check_foreign_item, early_passes, it);
930935
ast_visit::walk_foreign_item(cx, it);
936+
run_lints!(cx, check_foreign_item_post, early_passes, it);
931937
})
932938
}
933939

@@ -952,6 +958,7 @@ impl<'a, 'v> ast_visit::Visitor<'v> for EarlyContext<'a> {
952958
body: &'v ast::Block, span: Span, id: ast::NodeId) {
953959
run_lints!(self, check_fn, early_passes, fk, decl, body, span, id);
954960
ast_visit::walk_fn(self, fk, decl, body, span);
961+
run_lints!(self, check_fn_post, early_passes, fk, decl, body, span, id);
955962
}
956963

957964
fn visit_variant_data(&mut self,
@@ -992,6 +999,7 @@ impl<'a, 'v> ast_visit::Visitor<'v> for EarlyContext<'a> {
992999
fn visit_mod(&mut self, m: &ast::Mod, s: Span, n: ast::NodeId) {
9931000
run_lints!(self, check_mod, early_passes, m, s, n);
9941001
ast_visit::walk_mod(self, m);
1002+
run_lints!(self, check_mod_post, early_passes, m, s, n);
9951003
}
9961004

9971005
fn visit_local(&mut self, l: &ast::Local) {
@@ -1031,6 +1039,7 @@ impl<'a, 'v> ast_visit::Visitor<'v> for EarlyContext<'a> {
10311039
run_lints!(cx, check_trait_item, early_passes, trait_item);
10321040
cx.visit_ids(|v| v.visit_trait_item(trait_item));
10331041
ast_visit::walk_trait_item(cx, trait_item);
1042+
run_lints!(cx, check_trait_item_post, early_passes, trait_item);
10341043
});
10351044
}
10361045

@@ -1039,6 +1048,7 @@ impl<'a, 'v> ast_visit::Visitor<'v> for EarlyContext<'a> {
10391048
run_lints!(cx, check_impl_item, early_passes, impl_item);
10401049
cx.visit_ids(|v| v.visit_impl_item(impl_item));
10411050
ast_visit::walk_impl_item(cx, impl_item);
1051+
run_lints!(cx, check_impl_item_post, early_passes, impl_item);
10421052
});
10431053
}
10441054

‎branches/stable/src/librustc/lint/mod.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,9 @@ pub trait LateLintPass: LintPass {
134134
fn check_crate(&mut self, _: &LateContext, _: &hir::Crate) { }
135135
fn check_crate_post(&mut self, _: &LateContext, _: &hir::Crate) { }
136136
fn check_mod(&mut self, _: &LateContext, _: &hir::Mod, _: Span, _: ast::NodeId) { }
137+
fn check_mod_post(&mut self, _: &LateContext, _: &hir::Mod, _: Span, _: ast::NodeId) { }
137138
fn check_foreign_item(&mut self, _: &LateContext, _: &hir::ForeignItem) { }
139+
fn check_foreign_item_post(&mut self, _: &LateContext, _: &hir::ForeignItem) { }
138140
fn check_item(&mut self, _: &LateContext, _: &hir::Item) { }
139141
fn check_item_post(&mut self, _: &LateContext, _: &hir::Item) { }
140142
fn check_local(&mut self, _: &LateContext, _: &hir::Local) { }
@@ -150,8 +152,12 @@ pub trait LateLintPass: LintPass {
150152
fn check_generics(&mut self, _: &LateContext, _: &hir::Generics) { }
151153
fn check_fn(&mut self, _: &LateContext,
152154
_: FnKind, _: &hir::FnDecl, _: &hir::Block, _: Span, _: ast::NodeId) { }
155+
fn check_fn_post(&mut self, _: &LateContext,
156+
_: FnKind, _: &hir::FnDecl, _: &hir::Block, _: Span, _: ast::NodeId) { }
153157
fn check_trait_item(&mut self, _: &LateContext, _: &hir::TraitItem) { }
158+
fn check_trait_item_post(&mut self, _: &LateContext, _: &hir::TraitItem) { }
154159
fn check_impl_item(&mut self, _: &LateContext, _: &hir::ImplItem) { }
160+
fn check_impl_item_post(&mut self, _: &LateContext, _: &hir::ImplItem) { }
155161
fn check_struct_def(&mut self, _: &LateContext,
156162
_: &hir::VariantData, _: ast::Name, _: &hir::Generics, _: ast::NodeId) { }
157163
fn check_struct_def_post(&mut self, _: &LateContext,
@@ -179,7 +185,9 @@ pub trait EarlyLintPass: LintPass {
179185
fn check_crate(&mut self, _: &EarlyContext, _: &ast::Crate) { }
180186
fn check_crate_post(&mut self, _: &EarlyContext, _: &ast::Crate) { }
181187
fn check_mod(&mut self, _: &EarlyContext, _: &ast::Mod, _: Span, _: ast::NodeId) { }
188+
fn check_mod_post(&mut self, _: &EarlyContext, _: &ast::Mod, _: Span, _: ast::NodeId) { }
182189
fn check_foreign_item(&mut self, _: &EarlyContext, _: &ast::ForeignItem) { }
190+
fn check_foreign_item_post(&mut self, _: &EarlyContext, _: &ast::ForeignItem) { }
183191
fn check_item(&mut self, _: &EarlyContext, _: &ast::Item) { }
184192
fn check_item_post(&mut self, _: &EarlyContext, _: &ast::Item) { }
185193
fn check_local(&mut self, _: &EarlyContext, _: &ast::Local) { }
@@ -195,8 +203,12 @@ pub trait EarlyLintPass: LintPass {
195203
fn check_generics(&mut self, _: &EarlyContext, _: &ast::Generics) { }
196204
fn check_fn(&mut self, _: &EarlyContext,
197205
_: ast_visit::FnKind, _: &ast::FnDecl, _: &ast::Block, _: Span, _: ast::NodeId) { }
206+
fn check_fn_post(&mut self, _: &EarlyContext,
207+
_: ast_visit::FnKind, _: &ast::FnDecl, _: &ast::Block, _: Span, _: ast::NodeId) { }
198208
fn check_trait_item(&mut self, _: &EarlyContext, _: &ast::TraitItem) { }
209+
fn check_trait_item_post(&mut self, _: &EarlyContext, _: &ast::TraitItem) { }
199210
fn check_impl_item(&mut self, _: &EarlyContext, _: &ast::ImplItem) { }
211+
fn check_impl_item_post(&mut self, _: &EarlyContext, _: &ast::ImplItem) { }
200212
fn check_struct_def(&mut self, _: &EarlyContext,
201213
_: &ast::VariantData, _: ast::Ident, _: &ast::Generics, _: ast::NodeId) { }
202214
fn check_struct_def_post(&mut self, _: &EarlyContext,

‎branches/stable/src/librustc/middle/dataflow.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ impl<'a, 'tcx, O:DataFlowOperator> DataFlowContext<'a, 'tcx, O> {
489489
let bits = &mut self.scope_kills[start.. end];
490490
debug!("{} add_kills_from_flow_exits flow_exit={:?} bits={} [before]",
491491
self.analysis_name, flow_exit, mut_bits_to_string(bits));
492-
bits.copy_from_slice(&orig_kills[..]);
492+
bits.clone_from_slice(&orig_kills[..]);
493493
debug!("{} add_kills_from_flow_exits flow_exit={:?} bits={} [after]",
494494
self.analysis_name, flow_exit, mut_bits_to_string(bits));
495495
}
@@ -556,7 +556,7 @@ impl<'a, 'b, 'tcx, O:DataFlowOperator> PropagationContext<'a, 'b, 'tcx, O> {
556556
let (start, end) = self.dfcx.compute_id_range(node_index);
557557

558558
// Initialize local bitvector with state on-entry.
559-
in_out.copy_from_slice(&self.dfcx.on_entry[start.. end]);
559+
in_out.clone_from_slice(&self.dfcx.on_entry[start.. end]);
560560

561561
// Compute state on-exit by applying transfer function to
562562
// state on-entry.

‎branches/stable/src/librustc_back/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#![cfg_attr(not(stage0), deny(warnings))]
3232

3333
#![feature(box_syntax)]
34-
#![feature(copy_from_slice)]
3534
#![feature(libc)]
3635
#![feature(rand)]
3736
#![feature(rustc_private)]

‎branches/stable/src/librustc_back/sha2.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,13 @@ impl FixedBuffer for FixedBuffer64 {
134134
let buffer_remaining = size - self.buffer_idx;
135135
if input.len() >= buffer_remaining {
136136
self.buffer[self.buffer_idx..size]
137-
.copy_from_slice(&input[..buffer_remaining]);
137+
.clone_from_slice(&input[..buffer_remaining]);
138138
self.buffer_idx = 0;
139139
func(&self.buffer);
140140
i += buffer_remaining;
141141
} else {
142142
self.buffer[self.buffer_idx..self.buffer_idx + input.len()]
143-
.copy_from_slice(input);
143+
.clone_from_slice(input);
144144
self.buffer_idx += input.len();
145145
return;
146146
}
@@ -157,7 +157,7 @@ impl FixedBuffer for FixedBuffer64 {
157157
// data left in the input vector will be less than the buffer size and the buffer will
158158
// be empty.
159159
let input_remaining = input.len() - i;
160-
self.buffer[..input_remaining].copy_from_slice(&input[i..]);
160+
self.buffer[..input_remaining].clone_from_slice(&input[i..]);
161161
self.buffer_idx += input_remaining;
162162
}
163163

‎branches/stable/src/libstd/io/cursor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ impl Write for Cursor<Vec<u8>> {
256256
let pos = pos as usize;
257257
let space = self.inner.len() - pos;
258258
let (left, right) = buf.split_at(cmp::min(space, buf.len()));
259-
self.inner[pos..pos + left.len()].copy_from_slice(left);
259+
self.inner[pos..pos + left.len()].clone_from_slice(left);
260260
self.inner.extend_from_slice(right);
261261
}
262262

‎branches/stable/src/libstd/io/impls.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ impl<'a> Read for &'a [u8] {
156156
fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
157157
let amt = cmp::min(buf.len(), self.len());
158158
let (a, b) = self.split_at(amt);
159-
buf[..amt].copy_from_slice(a);
159+
buf[..amt].clone_from_slice(a);
160160
*self = b;
161161
Ok(amt)
162162
}
@@ -168,7 +168,7 @@ impl<'a> Read for &'a [u8] {
168168
"failed to fill whole buffer"));
169169
}
170170
let (a, b) = self.split_at(buf.len());
171-
buf.copy_from_slice(a);
171+
buf.clone_from_slice(a);
172172
*self = b;
173173
Ok(())
174174
}
@@ -189,7 +189,7 @@ impl<'a> Write for &'a mut [u8] {
189189
fn write(&mut self, data: &[u8]) -> io::Result<usize> {
190190
let amt = cmp::min(data.len(), self.len());
191191
let (a, b) = mem::replace(self, &mut []).split_at_mut(amt);
192-
a.copy_from_slice(&data[..amt]);
192+
a.clone_from_slice(&data[..amt]);
193193
*self = b;
194194
Ok(amt)
195195
}

‎branches/stable/src/libstd/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@
222222
#![feature(collections)]
223223
#![feature(collections_bound)]
224224
#![feature(const_fn)]
225-
#![feature(copy_from_slice)]
226225
#![feature(core_float)]
227226
#![feature(core_intrinsics)]
228227
#![feature(decode_utf16)]

‎branches/stable/src/libstd/net/parser.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ impl<'a> Parser<'a> {
191191
fn ipv6_addr_from_head_tail(head: &[u16], tail: &[u16]) -> Ipv6Addr {
192192
assert!(head.len() + tail.len() <= 8);
193193
let mut gs = [0; 8];
194-
gs[..head.len()].copy_from_slice(head);
195-
gs[(8 - tail.len()) .. 8].copy_from_slice(tail);
194+
gs[..head.len()].clone_from_slice(head);
195+
gs[(8 - tail.len()) .. 8].clone_from_slice(tail);
196196
Ipv6Addr::new(gs[0], gs[1], gs[2], gs[3], gs[4], gs[5], gs[6], gs[7])
197197
}
198198

‎branches/stable/src/libstd/sys/common/wtf8.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ impl Wtf8Buf {
341341
Some((surrogate_pos, _)) => {
342342
pos = surrogate_pos + 3;
343343
self.bytes[surrogate_pos..pos]
344-
.copy_from_slice(UTF8_REPLACEMENT_CHARACTER);
344+
.clone_from_slice(UTF8_REPLACEMENT_CHARACTER);
345345
},
346346
None => return unsafe { String::from_utf8_unchecked(self.bytes) }
347347
}

‎branches/stable/src/libstd/sys/windows/rand.rs

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,13 @@ impl Rng for OsRng {
4848
unsafe { mem::transmute(v) }
4949
}
5050
fn fill_bytes(&mut self, v: &mut [u8]) {
51-
// CryptGenRandom takes a DWORD (u32) for the length so we need to
52-
// split up the buffer.
53-
for slice in v.chunks_mut(<c::DWORD>::max_value() as usize) {
54-
let ret = unsafe {
55-
c::CryptGenRandom(self.hcryptprov, slice.len() as c::DWORD,
56-
slice.as_mut_ptr())
57-
};
58-
if ret == 0 {
59-
panic!("couldn't generate random bytes: {}",
60-
io::Error::last_os_error());
61-
}
51+
let ret = unsafe {
52+
c::CryptGenRandom(self.hcryptprov, v.len() as c::DWORD,
53+
v.as_mut_ptr())
54+
};
55+
if ret == 0 {
56+
panic!("couldn't generate random bytes: {}",
57+
io::Error::last_os_error());
6258
}
6359
}
6460
}

0 commit comments

Comments
 (0)