diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-07-03 08:19:04 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-03 08:19:04 -0700 |
commit | b0a8ce5341f5148e36523fee0b0fcbc2684c0a68 (patch) | |
tree | f7c3746dbfa55e7ba5d863a921b7a89211974858 /components/net/http_loader.rs | |
parent | a9c58c99fb897f95f37d893ecb3994864ef58da9 (diff) | |
parent | d9c9d4ab369c09dae378cb886b9dc7409f114c8f (diff) | |
download | servo-b0a8ce5341f5148e36523fee0b0fcbc2684c0a68.tar.gz servo-b0a8ce5341f5148e36523fee0b0fcbc2684c0a68.zip |
Auto merge of #12178 - frewsxcv:prefs, r=emilio
Refactor `util::prefs` operations to be methods on static struct.
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because _____
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12178)
<!-- Reviewable:end -->
Diffstat (limited to 'components/net/http_loader.rs')
-rw-r--r-- | components/net/http_loader.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs index 593ae3e1ead..108cc9b4da1 100644 --- a/components/net/http_loader.rs +++ b/components/net/http_loader.rs @@ -51,7 +51,7 @@ use time::Tm; #[cfg(any(target_os = "macos", target_os = "linux"))] use tinyfiledialogs; use url::{Url, Position}; -use util::prefs; +use util::prefs::PREFS; use util::thread::spawn_named; use uuid; @@ -860,7 +860,7 @@ pub fn load<A, B>(load_data: &LoadData, user_agent: String, cancel_listener: &CancellationListener) -> Result<StreamedResponse, LoadError> where A: HttpRequest + 'static, B: UIProvider { - let max_redirects = prefs::get_pref("network.http.redirection-limit").as_i64().unwrap() as u32; + let max_redirects = PREFS.get("network.http.redirection-limit").as_i64().unwrap() as u32; let mut iters = 0; // URL of the document being loaded, as seen by all the higher-level code. let mut doc_url = load_data.url.clone(); |