Upgrade to rustc 1.4.0-dev (cb9323ec0 2015-09-01)

This commit is contained in:
Simon Sapin 2015-09-02 07:57:55 +02:00
parent ba2cb77c26
commit 40b4348824
28 changed files with 349 additions and 338 deletions

View file

@ -70,7 +70,7 @@ impl FontTemplate {
};
let maybe_weak_ref = match maybe_strong_ref {
Some(ref strong_ref) => Some(strong_ref.downgrade()),
Some(ref strong_ref) => Some(Arc::downgrade(strong_ref)),
None => None,
};
@ -159,7 +159,7 @@ impl FontTemplate {
assert!(self.strong_ref.is_none());
let template_data = Arc::new(FontTemplateData::new(self.identifier.clone(), None));
self.weak_ref = Some(template_data.downgrade());
self.weak_ref = Some(Arc::downgrade(&template_data));
template_data
}
}