Skip to content

Commit 071591e

Browse files
committed
---
yaml --- r: 273140 b: refs/heads/beta c: 957ee5c h: refs/heads/master
1 parent c602c27 commit 071591e

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: 1f34086e947139d498847dce49ba437748f17c2d
26+
refs/heads/beta: 957ee5ce347999ef2c1acfdb63a76643c61f6516
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc/middle/subst.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,15 @@ impl<'tcx> Substs<'tcx> {
160160
Substs { types: types, regions: regions }
161161
}
162162

163+
pub fn with_method_from_subst(self, other: &Substs<'tcx>) -> Substs<'tcx> {
164+
let Substs { types, regions } = self;
165+
let types = types.with_vec(FnSpace, other.types.get_slice(FnSpace).to_vec());
166+
let regions = regions.map(|r| {
167+
r.with_vec(FnSpace, other.regions().get_slice(FnSpace).to_vec())
168+
});
169+
Substs { types: types, regions: regions }
170+
}
171+
163172
/// Creates a trait-ref out of this substs, ignoring the FnSpace substs
164173
pub fn to_trait_ref(&self, tcx: &TyCtxt<'tcx>, trait_id: DefId)
165174
-> ty::TraitRef<'tcx> {

0 commit comments

Comments
 (0)