Martin Robinson
2b8865b89f
servo: Merge #6591 - Upgrade to rustc 1.3.0-dev (fddfd089b 2015-07-10) (from servo:rustup_2015-07-10); r=larsbergstrom
...
Depends on https://github.com/jgraham/webdriver-rust/pull/12 .
Fixes #6020 .
Source-Repo: https://github.com/servo/servo
Source-Revision: 9af229b83095f2f8cfe7b61003b85ddf781f4ea7
2015-07-14 13:40:22 -06:00
Ms2ger
750bc64737
servo: Merge #6325 - Use str::parse() rather than FromStr::from_str (from Ms2ger:from_str); r=nox
...
The former appears to be preferred.
Source-Repo: https://github.com/servo/servo
Source-Revision: db2eb36e19581eee83247160bbb03e2a671d0479
2015-06-14 03:55:56 -06:00
Corey Farwell
43e2d6c6d7
servo: Merge #6230 - Remove get_ prefix on getters (from frewsxcv:getters-get); r=nox
...
Part of #6224
I certainly didn't remove all of them; I avoided `unsafe` areas and also `components/script`
Source-Repo: https://github.com/servo/servo
Source-Revision: f6fe1953343a417b62fb310a380af7c6973849b0
2015-06-02 08:17:03 -05:00
Corey Farwell
3d43073796
servo: Merge #6174 - Reduce max line length from 150 to 120 characters (from frewsxcv:cleanup-long-lines); r=SimonSapin
...
Part of https://github.com/servo/servo/issues/6041
Source-Repo: https://github.com/servo/servo
Source-Revision: 542519ebfd073662bc9421ac5fa0aa01ebc0d6fe
2015-05-24 18:27:26 -05:00
Keith Yeung
61c2e05a7c
servo: Merge #6129 - Implement fetch (partial #4576 ) (from KiChjang:fetch-spec); r=jdm
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 79ed6250f0535d62a12b1d7e47e48926d6e3925a
2015-05-19 23:08:41 -05:00
Ms2ger
87f11e1004
servo: Merge #6134 - Cleanup the fetch code (from Ms2ger:fetch); r=jdm
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 40dded8b3a2e9eb9c0f0b7af189df27f3ad6414a
2015-05-19 12:13:37 -05:00
Keith Yeung
f4e4b61f7c
servo: Merge #5824 - Implemented http fetch (partial #4576 ) (from KiChjang:http-fetch-spec); r=jdm
...
This is a work-in-progress for the implementation of HTTP fetch. Currently, it does not compile, as I haven't figured out how to solve the issues regarding borrows and lifetimes.
Source-Repo: https://github.com/servo/servo
Source-Revision: 90aacf00f866c7ef3b858d84585bd5142f74c9ee
2015-05-18 09:23:43 -05:00
Simon Sapin
b72bb5e7d5
servo: Merge #5935 - Upgrade Rust (from servo:rustup_2015-04-25); r=Ms2ger
...
r? everybody
Source-Repo: https://github.com/servo/servo
Source-Revision: 49aed6555dbc008c1a378c5cbb303f5467232b6b
2015-05-05 09:11:30 -05:00
Ms2ger
622e167a6a
servo: Merge #5888 - Prepare for the rustup (from Ms2ger:prepare-rustup); r=SimonSapin
...
Source-Repo: https://github.com/servo/servo
Source-Revision: ab2d07db1fabd7ad9590aa7296038bbc91806c3f
2015-04-28 17:52:49 -05:00
Corey Farwell
a0f726ff70
servo: Merge #5677 - Update WHATWG links to use HTTPS (from frewsxcv:https); r=Ms2ger
...
Extracted this out of #5649
This commit was created with the following commands:
```
find . -iname "*.webidl" -type f -print0 | xargs -0 sed -i '' 's/http:\(.*\)whatwg.org/https:\1whatwg.org/g'
```
```
find . -iname "*.rs" -type f -print0 | xargs -0 sed -i '' 's/http:\(.*\)whatwg.org/https:\1whatwg.org/g'
```
Source-Repo: https://github.com/servo/servo
Source-Revision: 4997d3a112354a407365fede1ab1944834a2e13c
2015-04-14 02:57:41 -05:00
Josh Matthews
92f2b44d8b
servo: Merge #5568 - Remove int_uint from net (from jdm:net_uint); r=jdm
...
Source-Repo: https://github.com/servo/servo
Source-Revision: cad27a9d25390cda965c591f180a46061a2c19e9
2015-04-08 01:47:56 -05:00
Ms2ger
761d1d93b7
servo: Merge #5303 - Update some code that's feature-gated under core (from Ms2ger:core); r=jdm
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 43f3f6c897916aea75773f74060ec84a338834d0
2015-03-21 12:57:46 -06:00
Simon Sapin
8fbd363d52
servo: Merge #4893 - Upgrade to rustc ba2f13ef0 2015-02-04 (from servo:rustup_2015-01-31); r=Ms2ger,glennw
...
Ready for review.
Final link step on android fails, but we know how to fix it and will add it to this branch soon.
Source-Repo: https://github.com/servo/servo
Source-Revision: 2cc08f289ab909de44fa09a07b2c43b70ce379b9
2015-02-11 17:24:45 -07:00
Josh Matthews
b11f7d94dc
servo: Merge #4719 - Update rustc to 00b112c45a604fa6f4b59af2a40c9deeadfdb7c6/rustc-1.0.0-dev (from servo:rustup_20150109); r=jdm
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 3f9012864a2cd927cf17a8e11dfa6922add1b7df
2015-01-27 18:15:50 -07:00
Ms2ger
b3c7f9d2ca
servo: Merge #4554 - Update rustc to revision 2cfb5acb5a2751c759627377e602bac4f88f2d19 (from servo:rustup_20141221); r=jdm
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 1d7148c79f9124779a910fd5291c5fa0543b2dae
2015-01-08 08:00:57 -07:00
Ms2ger
2979891740
servo: Merge #4542 - Prepare for the rust upgrade (from servo:pre-rustup_20141221); r=saneyuki
...
In particular, this contains changes to qualify enums where rust will require it, and to stop using some features that will be removed.
Source-Repo: https://github.com/servo/servo
Source-Revision: ba8cf6b0e6145265f9472d4855f078d8b5943fe7
2015-01-04 12:39:47 -07:00
Tetsuharu OHZEKI
f3cdf29efa
servo: Merge #4423 - net: Remove glob imports added in #4405 (from saneyuki:glob_net); r=jdm
...
#4406
Source-Repo: https://github.com/servo/servo
Source-Revision: 4ccecd8dca406a4f0d62ac50f461b09816786ec5
2014-12-18 13:21:55 -07:00
Glenn Watson
636d338cf6
servo: Merge #4405 - Update rustc to revision 3dcd2157403163789aaf21a9ab3c4d30a7c6494d (from servo:rustup_20141124); r=jdm
...
Source-Repo: https://github.com/servo/servo
Source-Revision: fbf42c951b2f53d91e2f32f8035484a07ea83493
2014-12-17 18:45:49 -07:00
Manish Goregaokar
08f0462c06
servo: Merge #4198 - Hyper+OpenSSL on Android (from Manishearth:hyper-droid); r=Manishearth
...
This is the Hyper pull request, plus the set up for OpenSSL on Android to make it merge.
Sean's commits have been reviewed in #4065 (My Android changes were reviewed by Glenn)
Source-Repo: https://github.com/servo/servo
Source-Revision: 6bd9bf979bcfa96ea14e666b59eab01a6d6c373e
2014-12-05 04:16:11 -07:00
Glenn Watson
71f726977a
servo: Merge #3948 - Rust upgrade to rustc hash b03a2755193cd756583bcf5831cf4545d75ecb8a (from servo:rustup-20141105_2); r=Manishearth
...
Source-Repo: https://github.com/servo/servo
Source-Revision: c5e1b0d32e17fad29799023c85e2e73ac89c3af7
2014-11-12 20:48:31 -07:00
Simon Sapin
e245f210fb
servo: Merge #3438 - Upgrade Rust (from servo:rustup)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 045328c8e94f5bdfcd67105c5dfa9209f4cd501c
2014-09-20 15:35:08 -07:00
Matt Brubeck
5c59759b72
servo: Merge #3395 - Fix unit test failures. r=jdm (from mbrubeck:doctest)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 8aeb90e8c34a6872cf418643fef40e67382737e2
2014-09-17 17:05:29 -07:00
Jack Moffitt
132ee35633
servo: Merge #3230 - Cargoify servo (from servo:cargoify)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: b1305bb7d051f83850c51bb0da0ccc86a5e07922
2014-09-09 08:18:18 -06:00