Drop lifetime generic argument from PyCommonString

youknowone · youknowone · commit dc6960111060 · 2020-04-19T04:08:17.000+09:00
diff --git a/vm/src/obj/objbyteinner.rs b/vm/src/obj/objbyteinner.rs
@@ -1299,7 +1299,7 @@ pub fn bytes_zfill(bytes: &[u8], width: usize) -> Vec<u8> {
 
 const ASCII_WHITESPACES: [u8; 6] = [0x20, 0x09, 0x0a, 0x0c, 0x0d, 0x0b];
 
-impl PyCommonString<'_, u8> for [u8] {
+impl PyCommonString<u8> for [u8] {
     fn get_slice(&self, range: std::ops::Range<usize>) -> &Self {
         &self[range]
     }
diff --git a/vm/src/obj/objstr.rs b/vm/src/obj/objstr.rs
@@ -1799,7 +1799,7 @@ mod tests {
     }
 }
 
-impl PyCommonString<'_, char> for str {
+impl PyCommonString<char> for str {
     fn get_slice(&self, range: std::ops::Range<usize>) -> &Self {
         &self[range]
     }
diff --git a/vm/src/obj/pystr.rs b/vm/src/obj/pystr.rs
@@ -37,10 +37,7 @@ impl StringRange for std::ops::Range<usize> {
     }
 }
 
-pub trait PyCommonString<'a, E>
-where
-    Self: 'a,
-{
+pub trait PyCommonString<E> {
     fn get_slice(&self, range: std::ops::Range<usize>) -> &Self;
     fn len(&self) -> usize;
 

Original file line number	Diff line number	Diff line change
`@@ -1299,7 +1299,7 @@ pub fn bytes_zfill(bytes: &[u8], width: usize) -> Vec<u8> {`
`1299`	`1299`
`1300`	`1300`	`const ASCII_WHITESPACES: [u8; 6] = [0x20, 0x09, 0x0a, 0x0c, 0x0d, 0x0b];`
`1301`	`1301`
`1302`		`-impl PyCommonString<'_, u8> for [u8] {`
	`1302`	`+impl PyCommonString<u8> for [u8] {`
`1303`	`1303`	`fn get_slice(&self, range: std::ops::Range<usize>) -> &Self {`
`1304`	`1304`	`&self[range]`
`1305`	`1305`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1799,7 +1799,7 @@ mod tests {`
`1799`	`1799`	`}`
`1800`	`1800`	`}`
`1801`	`1801`
`1802`		`-impl PyCommonString<'_, char> for str {`
	`1802`	`+impl PyCommonString<char> for str {`
`1803`	`1803`	`fn get_slice(&self, range: std::ops::Range<usize>) -> &Self {`
`1804`	`1804`	`&self[range]`
`1805`	`1805`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,7 @@ impl StringRange for std::ops::Range<usize> {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`-pub trait PyCommonString<'a, E>`
`41`		`-where`
`42`		`- Self: 'a,`
`43`		`-{`
	`40`	`+pub trait PyCommonString<E> {`
`44`	`41`	`fn get_slice(&self, range: std::ops::Range<usize>) -> &Self;`
`45`	`42`	`fn len(&self) -> usize;`
`46`	`43`