rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

std: convert character-based str::find_* to methods. Add .slice_{to,from} methods.

Browse Source
This commit is contained in:
Huon Wilson
2013-06-10 13:09:51 +10:00
parent 76fc9be5a1
commit 0cfc08d81e
9 changed files with 158 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libstd/path.rs
View File

@@ -479,8 +479,8 @@ impl GenericPath for PosixPath {
match self.filename() {
None => None,
Some(ref f) => {
match str::rfind_char(*f, '.') {
Some(p) => Some(f.slice(0, p).to_owned()),
match f.rfind('.') {
Some(p) => Some(f.slice_to(p).to_owned()),
None => Some(copy *f),
}
}
@@ -491,8 +491,8 @@ impl GenericPath for PosixPath {
match self.filename() {
None => None,
Some(ref f) => {
match str::rfind_char(*f, '.') {
Some(p) if p < f.len() => Some(f.slice(p, f.len()).to_owned()),
match f.rfind('.') {
Some(p) if p < f.len() => Some(f.slice_from(p).to_owned()),
_ => None,
}
}
@@ -693,8 +693,8 @@ impl GenericPath for WindowsPath {
match self.filename() {
None => None,
Some(ref f) => {
match str::rfind_char(*f, '.') {
Some(p) => Some(f.slice(0, p).to_owned()),
match f.rfind('.') {
Some(p) => Some(f.slice_to(p).to_owned()),
None => Some(copy *f),
}
}
@@ -705,8 +705,8 @@ impl GenericPath for WindowsPath {
match self.filename() {
None => None,
Some(ref f) => {
match str::rfind_char(*f, '.') {
Some(p) if p < f.len() => Some(f.slice(p, f.len()).to_owned()),
match f.rfind('.') {
Some(p) if p < f.len() => Some(f.slice_from(p).to_owned()),
_ => None,
}
}