diff options
| author | bors-servo <release+servo@mozilla.com> | 2013-10-22 09:16:17 -0700 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2013-10-22 09:16:17 -0700 |
| commit | 797143a1d3e09b4ddd35a1ce5948be424ec3f9ef (patch) | |
| tree | c0f9307660adbc23308ea41505f0cf922fcd4af4 /src/components/script/dom/formdata.rs | |
| parent | 4d8f7fd056cc59cce02de9f3e710116ea8a85afe (diff) | |
| parent | 2558c723c9444dd4957a3131d7e68b56495b32ea (diff) | |
| download | servo-797143a1d3e09b4ddd35a1ce5948be424ec3f9ef.tar.gz servo-797143a1d3e09b4ddd35a1ce5948be424ec3f9ef.zip | |
auto merge of #1067 : metajack/servo/rust-up-20131014, r=jdm
This upgrades to this morning's master. We have unfortunately broken the Android build, but I will update that in a second pull request as I think it's more than a single upgrade behind.
Diffstat (limited to 'src/components/script/dom/formdata.rs')
| -rw-r--r-- | src/components/script/dom/formdata.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/script/dom/formdata.rs b/src/components/script/dom/formdata.rs index b6879f9b81d..cc3f1d6b6ab 100644 --- a/src/components/script/dom/formdata.rs +++ b/src/components/script/dom/formdata.rs @@ -46,7 +46,7 @@ impl FormData { pub fn Append(&mut self, name: &DOMString, value: @mut Blob, filename: Option<DOMString>) { let blob = BlobData { blob: value, - name: filename.unwrap_or_default(Some(~"default")) + name: filename.unwrap_or(Some(~"default")) }; self.data.insert(null_str_as_empty(name), blob); } |