Skip to content

Commit d3c82e0

Browse files
committed
---
yaml --- r: 210015 b: refs/heads/try c: b892264 h: refs/heads/master i: 210013: 76cfb97 210011: 3ffe93a 210007: 723d807 209999: 8ac4d33 209983: 2ece0fb v: v3
1 parent 946a087 commit d3c82e0

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
5-
refs/heads/try: d8b64c7fb2809eeba8ff9125cc95c4c38efb9a8a
5+
refs/heads/try: b892264ea4f048feb5f380d3e659d82ba463f5b7
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/doc/trpl/ufcs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ not, and so we need to pass an explicit `&b`.
8989
The form of UFCS we just talked about:
9090

9191
```rust,ignore
92-
Trait::method(args);
92+
Type::method(args);
9393
```
9494

9595
Is a short-hand. There’s an expanded form of this that’s needed in some

branches/try/src/librustc_typeck/check/dropck.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,9 +464,9 @@ fn iterate_over_potentially_unsafe_regions_in_type<'a, 'tcx>(
464464
ty::Predicate::Trait(ty::Binder(ref t_pred)) => {
465465
let def_id = t_pred.trait_ref.def_id;
466466
match rcx.tcx().lang_items.to_builtin_kind(def_id) {
467+
// Issue 24895: deliberately do not include `BoundCopy` here.
467468
Some(ty::BoundSend) |
468469
Some(ty::BoundSized) |
469-
Some(ty::BoundCopy) |
470470
Some(ty::BoundSync) => false,
471471
_ => true,
472472
}

0 commit comments

Comments
 (0)