Skip to content

Commit edfb83c

Browse files
borsbors
committed
auto merge of #18914 : Gankro/rust/cloned, r=aturon
Part of #18424. r? @aturon [breaking-change]
2 parents 803aacd + dfb7a81 commit edfb83c

File tree

31 files changed

+121
-119
lines changed

31 files changed

+121
-119
lines changed

‎src/libcore/option.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ use mem;
150150
use result::{Result, Ok, Err};
151151
use slice;
152152
use slice::AsSlice;
153+
use clone::Clone;
153154

154155
// Note that this is not a lang item per se, but it has a hidden dependency on
155156
// `Iterator`, which is one. The compiler assumes that the `next` method of
@@ -691,6 +692,14 @@ impl<T> Option<T> {
691692
}
692693
}
693694

695+
impl<'a, T: Clone> Option<&'a T> {
696+
/// Maps an Option<&T> to an Option<T> by cloning the contents of the Option<&T>.
697+
#[unstable = "recently added as part of collections reform"]
698+
pub fn cloned(self) -> Option<T> {
699+
self.map(|t| t.clone())
700+
}
701+
}
702+
694703
impl<T: Default> Option<T> {
695704
/// Returns the contained value or a default
696705
///

‎src/libcoretest/option.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use core::option::*;
1212
use core::kinds::marker;
1313
use core::mem;
14+
use core::clone::Clone;
1415

1516
#[test]
1617
fn test_get_ptr() {
@@ -239,3 +240,15 @@ fn test_collect() {
239240

240241
assert!(v == None);
241242
}
243+
244+
fn test_cloned() {
245+
let s = 1u32;
246+
let n: Option<&'static u32> = None;
247+
let o = Some(&s);
248+
249+
assert_eq!(o.clone(), Some(&s));
250+
assert_eq!(o.cloned(), Some(1u32));
251+
252+
assert_eq!(n.clone(), None);
253+
assert_eq!(n.cloned(), None);
254+
}

‎src/librustc/lint/builtin.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ struct ImproperCTypesVisitor<'a, 'tcx: 'a> {
391391

392392
impl<'a, 'tcx> ImproperCTypesVisitor<'a, 'tcx> {
393393
fn check_def(&mut self, sp: Span, ty_id: ast::NodeId, path_id: ast::NodeId) {
394-
match self.cx.tcx.def_map.borrow().get_copy(&path_id) {
394+
match self.cx.tcx.def_map.borrow()[path_id].clone() {
395395
def::DefPrimTy(ast::TyInt(ast::TyI)) => {
396396
self.cx.span_lint(IMPROPER_CTYPES, sp,
397397
"found rust type `int` in foreign module, while \
@@ -869,7 +869,7 @@ fn method_context(cx: &Context, m: &ast::Method) -> MethodContext {
869869
node: m.id
870870
};
871871

872-
match cx.tcx.impl_or_trait_items.borrow().find_copy(&did) {
872+
match cx.tcx.impl_or_trait_items.borrow().get(&did).cloned() {
873873
None => cx.sess().span_bug(m.span, "missing method descriptor?!"),
874874
Some(md) => {
875875
match md {

‎src/librustc/metadata/encoder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1863,7 +1863,7 @@ impl<'a, 'b, 'c, 'tcx, 'v> Visitor<'v> for ImplVisitor<'a, 'b, 'c, 'tcx> {
18631863
match item.node {
18641864
ItemImpl(_, Some(ref trait_ref), _, _) => {
18651865
let def_map = &self.ecx.tcx.def_map;
1866-
let trait_def = def_map.borrow().get_copy(&trait_ref.ref_id);
1866+
let trait_def = def_map.borrow()[trait_ref.ref_id].clone();
18671867
let def_id = trait_def.def_id();
18681868

18691869
// Load eagerly if this is an implementation of the Drop trait

‎src/librustc/metadata/tydecode.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ fn parse_ty(st: &mut PState, conv: conv_did) -> ty::t {
439439
pos: pos,
440440
len: len };
441441

442-
match st.tcx.rcache.borrow().find_copy(&key) {
442+
match st.tcx.rcache.borrow().get(&key).cloned() {
443443
Some(tt) => return tt,
444444
None => {}
445445
}

‎src/librustc/middle/astencode.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1200,8 +1200,7 @@ fn encode_side_tables_for_id(ecx: &e::EncodeContext,
12001200
var_id: var_id,
12011201
closure_expr_id: id
12021202
};
1203-
let upvar_borrow = tcx.upvar_borrow_map.borrow()
1204-
.get_copy(&upvar_id);
1203+
let upvar_borrow = tcx.upvar_borrow_map.borrow()[upvar_id].clone();
12051204
var_id.encode(rbml_w);
12061205
upvar_borrow.encode(rbml_w);
12071206
})

‎src/librustc/middle/borrowck/move_data.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ impl MoveData {
295295

296296
fn existing_move_path(&self, lp: &Rc<LoanPath>)
297297
-> Option<MovePathIndex> {
298-
self.path_map.borrow().find_copy(lp)
298+
self.path_map.borrow().get(lp).cloned()
299299
}
300300

301301
fn existing_base_paths(&self, lp: &Rc<LoanPath>)
@@ -312,7 +312,7 @@ impl MoveData {
312312
* paths of `lp` to `result`, but does not add new move paths
313313
*/
314314

315-
match self.path_map.borrow().find_copy(lp) {
315+
match self.path_map.borrow().get(lp).cloned() {
316316
Some(index) => {
317317
self.each_base_path(index, |p| {
318318
result.push(p);

‎src/librustc/middle/check_match.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ impl<'a, 'tcx> Folder for StaticInliner<'a, 'tcx> {
359359
fn fold_pat(&mut self, pat: P<Pat>) -> P<Pat> {
360360
match pat.node {
361361
PatIdent(..) | PatEnum(..) => {
362-
let def = self.tcx.def_map.borrow().find_copy(&pat.id);
362+
let def = self.tcx.def_map.borrow().get(&pat.id).cloned();
363363
match def {
364364
Some(DefConst(did)) => match lookup_const_by_id(self.tcx, did) {
365365
Some(const_expr) => {
@@ -749,7 +749,7 @@ pub fn specialize<'a>(cx: &MatchCheckCtxt, r: &[&'a Pat],
749749
Some(Vec::from_elem(arity, DUMMY_WILD_PAT)),
750750

751751
&PatIdent(_, _, _) => {
752-
let opt_def = cx.tcx.def_map.borrow().find_copy(&pat_id);
752+
let opt_def = cx.tcx.def_map.borrow().get(&pat_id).cloned();
753753
match opt_def {
754754
Some(DefConst(..)) =>
755755
cx.tcx.sess.span_bug(pat_span, "const pattern should've \
@@ -764,7 +764,7 @@ pub fn specialize<'a>(cx: &MatchCheckCtxt, r: &[&'a Pat],
764764
}
765765

766766
&PatEnum(_, ref args) => {
767-
let def = cx.tcx.def_map.borrow().get_copy(&pat_id);
767+
let def = cx.tcx.def_map.borrow()[pat_id].clone();
768768
match def {
769769
DefConst(..) =>
770770
cx.tcx.sess.span_bug(pat_span, "const pattern should've \
@@ -782,7 +782,7 @@ pub fn specialize<'a>(cx: &MatchCheckCtxt, r: &[&'a Pat],
782782

783783
&PatStruct(_, ref pattern_fields, _) => {
784784
// Is this a struct or an enum variant?
785-
let def = cx.tcx.def_map.borrow().get_copy(&pat_id);
785+
let def = cx.tcx.def_map.borrow()[pat_id].clone();
786786
let class_id = match def {
787787
DefConst(..) =>
788788
cx.tcx.sess.span_bug(pat_span, "const pattern should've \

‎src/librustc/middle/const_eval.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ pub fn join_all<It: Iterator<constness>>(mut cs: It) -> constness {
8585
}
8686

8787
fn lookup_const<'a>(tcx: &'a ty::ctxt, e: &Expr) -> Option<&'a Expr> {
88-
let opt_def = tcx.def_map.borrow().find_copy(&e.id);
88+
let opt_def = tcx.def_map.borrow().get(&e.id).cloned();
8989
match opt_def {
9090
Some(def::DefConst(def_id)) => {
9191
lookup_const_by_id(tcx, def_id)
@@ -320,7 +320,7 @@ pub fn const_expr_to_pat(tcx: &ty::ctxt, expr: &Expr) -> P<Pat> {
320320
PatTup(exprs.iter().map(|expr| const_expr_to_pat(tcx, &**expr)).collect()),
321321

322322
ExprCall(ref callee, ref args) => {
323-
let def = tcx.def_map.borrow().get_copy(&callee.id);
323+
let def = tcx.def_map.borrow()[callee.id].clone();
324324
match tcx.def_map.borrow_mut().entry(expr.id) {
325325
Vacant(entry) => { entry.set(def); }
326326
_ => {}
@@ -352,7 +352,7 @@ pub fn const_expr_to_pat(tcx: &ty::ctxt, expr: &Expr) -> P<Pat> {
352352
}
353353

354354
ExprPath(ref path) => {
355-
let opt_def = tcx.def_map.borrow().find_copy(&expr.id);
355+
let opt_def = tcx.def_map.borrow().get(&expr.id).cloned();
356356
match opt_def {
357357
Some(def::DefStruct(..)) =>
358358
PatStruct(path.clone(), vec![], false),

‎src/librustc/middle/expr_use_visitor.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,7 @@ impl<'d,'t,'tcx,TYPER:mc::Typer<'tcx>> ExprUseVisitor<'d,'t,TYPER> {
850850

851851
// Each match binding is effectively an assignment to the
852852
// binding being produced.
853-
let def = def_map.borrow().get_copy(&pat.id);
853+
let def = def_map.borrow()[pat.id].clone();
854854
match mc.cat_def(pat.id, pat.span, pat_ty, def) {
855855
Ok(binding_cmt) => {
856856
delegate.mutate(pat.id, pat.span, binding_cmt, Init);
@@ -957,8 +957,7 @@ impl<'d,'t,'tcx,TYPER:mc::Typer<'tcx>> ExprUseVisitor<'d,'t,TYPER> {
957957
// inferred by regionbk
958958
let upvar_id = ty::UpvarId { var_id: id_var,
959959
closure_expr_id: closure_expr.id };
960-
let upvar_borrow = self.tcx().upvar_borrow_map.borrow()
961-
.get_copy(&upvar_id);
960+
let upvar_borrow = self.tcx().upvar_borrow_map.borrow()[upvar_id].clone();
962961

963962
self.delegate.borrow(closure_expr.id,
964963
closure_expr.span,

0 commit comments

Comments
 (0)