Skip to content

Commit db164b5

Browse files
committed
---
yaml --- r: 216318 b: refs/heads/stable c: b892264 h: refs/heads/master v: v3
1 parent 70e916d commit db164b5

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
@@ -29,5 +29,5 @@ refs/heads/tmp: 378a370ff2057afeb1eae86eb6e78c476866a4a6
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: a5286998df566e736b32f6795bfc3803bdaf453d
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: d8b64c7fb2809eeba8ff9125cc95c4c38efb9a8a
32+
refs/heads/stable: b892264ea4f048feb5f380d3e659d82ba463f5b7
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375

branches/stable/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/stable/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)