Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Stop abusing format! macro when construct a String

Browse source 
In these cases for `format!`, we're just constructing a String of the
single argument with no special format.
This commit is contained in:
Corey Farwell 2015-03-22 18:54:56 -04:00
parent 445f1c891a
commit 5a780cb221
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/dom/document.rs
View file

@ -1090,7 +1090,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
fn LastModified(self) -> DOMString { fn LastModified(self) -> DOMString {
match self.last_modified { match self.last_modified {
Some(ref t) => t.clone(), Some(ref t) => t.clone(),
None => format!("{}", time::now().strftime("%m/%d/%Y %H:%M:%S").unwrap()), None => time::now().strftime("%m/%d/%Y %H:%M:%S").unwrap().to_string(),
} }
} }

4
components/script/dom/xmlhttprequest.rs
View file

@ -616,13 +616,13 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> {
referer_url.serialize_host().map(|ref h| buf.push_str(h.as_slice())); referer_url.serialize_host().map(|ref h| buf.push_str(h.as_slice()));
referer_url.port().as_ref().map(|&p| { referer_url.port().as_ref().map(|&p| {
buf.push_str(":".as_slice()); buf.push_str(":".as_slice());
buf.push_str(format!("{}", p).as_slice()); buf.push_str(p.to_string().as_slice());
}); });
referer_url.serialize_path().map(|ref h| buf.push_str(h.as_slice())); referer_url.serialize_path().map(|ref h| buf.push_str(h.as_slice()));
self.request_headers.borrow_mut().set_raw("Referer".to_owned(), vec![buf.into_bytes()]); self.request_headers.borrow_mut().set_raw("Referer".to_owned(), vec![buf.into_bytes()]);
}, },
Ok(Some(ref req)) => self.insert_trusted_header("origin".to_owned(), Ok(Some(ref req)) => self.insert_trusted_header("origin".to_owned(),
format!("{}", req.origin)), req.origin.to_string()),
_ => {} _ => {}
} }

2
components/script/script_task.rs
View file

@ -1298,5 +1298,5 @@ pub fn get_page(page: &Rc<Page>, pipeline_id: PipelineId) -> Rc<Page> {
} }
fn dom_last_modified(tm: &Tm) -> String { fn dom_last_modified(tm: &Tm) -> String {
format!("{}", tm.to_local().strftime("%m/%d/%Y %H:%M:%S").unwrap()) tm.to_local().strftime("%m/%d/%Y %H:%M:%S").unwrap().to_string()
} }

2
components/util/opts.rs
View file

@ -237,7 +237,7 @@ pub fn from_cmdline_args(args: &[String]) -> bool {
let opt_match = match getopts::getopts(args, opts.as_slice()) { let opt_match = match getopts::getopts(args, opts.as_slice()) {
Ok(m) => m, Ok(m) => m,
Err(f) => { Err(f) => {
args_fail(format!("{}", f).as_slice()); args_fail(f.to_string().as_slice());
return false; return false;
} }
}; };

4
tests/contenttest.rs
View file

@ -45,7 +45,7 @@ fn parse_config(args: Vec<String>) -> Config {
let opts = vec!(reqopt("s", "source-dir", "source-dir", "source-dir")); let opts = vec!(reqopt("s", "source-dir", "source-dir", "source-dir"));
let matches = match getopts(args, opts.as_slice()) { let matches = match getopts(args, opts.as_slice()) {
Ok(m) => m, Ok(m) => m,
Err(f) => panic!(format!("{}", f)) Err(f) => panic!(f.to_string())
}; };
Config { Config {
@ -73,7 +73,7 @@ fn find_tests(config: Config) -> Vec<TestDescAndFn> {
_ => panic!("Error reading directory."), _ => panic!("Error reading directory."),
}; };
files.retain(|file| file.extension_str() == Some("html") ); files.retain(|file| file.extension_str() == Some("html") );
return files.iter().map(|file| make_test(format!("{}", file.display()))).collect(); return files.iter().map(|file| make_test(file.display().to_string())).collect();
} }
fn make_test(file: String) -> TestDescAndFn { fn make_test(file: String) -> TestDescAndFn {