Bug 1319083 - Relax the Sized constraint on nsA[C]String::assign/append, r=froydnj

MozReview-Commit-ID: Js5GOrnqtsg
This commit is contained in:
Michael Layzell 2016-11-19 13:56:42 -05:00
Родитель 26080db322
Коммит 29905acb08
1 изменённых файлов: 8 добавлений и 8 удалений

Просмотреть файл

@ -572,26 +572,26 @@ impl nsACString {
Gecko_FinalizeCString(self); Gecko_FinalizeCString(self);
} }
pub fn assign<T: AsRef<[u8]>>(&mut self, other: &T) { pub fn assign<T: AsRef<[u8]> + ?Sized>(&mut self, other: &T) {
let s = nsCString::from(other.as_ref()); let s = nsCString::from(other.as_ref());
unsafe { unsafe {
Gecko_AssignCString(self, &*s); Gecko_AssignCString(self, &*s);
} }
} }
pub fn assign_utf16<T: AsRef<[u16]>>(&mut self, other: &T) { pub fn assign_utf16<T: AsRef<[u16]> + ?Sized>(&mut self, other: &T) {
self.assign(&[]); self.assign(&[]);
self.append_utf16(other); self.append_utf16(other);
} }
pub fn append<T: AsRef<[u8]>>(&mut self, other: &T) { pub fn append<T: AsRef<[u8]> + ?Sized>(&mut self, other: &T) {
let s = nsCString::from(other.as_ref()); let s = nsCString::from(other.as_ref());
unsafe { unsafe {
Gecko_AppendCString(self, &*s); Gecko_AppendCString(self, &*s);
} }
} }
pub fn append_utf16<T: AsRef<[u16]>>(&mut self, other: &T) { pub fn append_utf16<T: AsRef<[u16]> + ?Sized>(&mut self, other: &T) {
let s = nsString::from(other.as_ref()); let s = nsString::from(other.as_ref());
unsafe { unsafe {
Gecko_AppendUTF16toCString(self, &*s); Gecko_AppendUTF16toCString(self, &*s);
@ -679,26 +679,26 @@ impl nsAString {
Gecko_FinalizeString(self); Gecko_FinalizeString(self);
} }
pub fn assign<T: AsRef<[u16]>>(&mut self, other: &T) { pub fn assign<T: AsRef<[u16]> + ?Sized>(&mut self, other: &T) {
let s = nsString::from(other.as_ref()); let s = nsString::from(other.as_ref());
unsafe { unsafe {
Gecko_AssignString(self, &*s); Gecko_AssignString(self, &*s);
} }
} }
pub fn assign_utf8<T: AsRef<[u8]>>(&mut self, other: &T) { pub fn assign_utf8<T: AsRef<[u8]> + ?Sized>(&mut self, other: &T) {
self.assign(&[]); self.assign(&[]);
self.append_utf8(other); self.append_utf8(other);
} }
pub fn append<T: AsRef<[u16]>>(&mut self, other: &T) { pub fn append<T: AsRef<[u16]> + ?Sized>(&mut self, other: &T) {
let s = nsString::from(other.as_ref()); let s = nsString::from(other.as_ref());
unsafe { unsafe {
Gecko_AppendString(self, &*s); Gecko_AppendString(self, &*s);
} }
} }
pub fn append_utf8<T: AsRef<[u8]>>(&mut self, other: &T) { pub fn append_utf8<T: AsRef<[u8]> + ?Sized>(&mut self, other: &T) {
let s = nsCString::from(other.as_ref()); let s = nsCString::from(other.as_ref());
unsafe { unsafe {
Gecko_AppendUTF8toString(self, &*s); Gecko_AppendUTF8toString(self, &*s);