Bläddra i källkod

Auto merge of #225 - servo:docs.rs, r=SimonSapin

Use doc.rs instead of Github Pages + Travis-CI

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-url/225)
<!-- Reviewable:end -->
bors-servo 10 år sedan
förälder
incheckning
bd4eff8aa4
3 ändrade filer med 2 tillägg och 21 borttagningar
  1. 0 7
      .travis.yml
  2. 1 13
      Makefile
  3. 1 1
      README.md

+ 0 - 7
.travis.yml

@@ -4,12 +4,5 @@ rust:
   - beta
   - stable
 script: make test
-after_success: |
-  [ $TRAVIS_RUST_VERSION = nightly ] &&
-  [ $TRAVIS_BRANCH = master ] &&
-  [ $TRAVIS_PULL_REQUEST = false ] &&
-  make upload-doc
-env:
-  - secure: Q5eFkWSv20gCxMXrF1BPBSY67qAi9XYKsGHbOc6c1hOf933AX9Wr2CqL8mBhgAZfe4TWEnazjMNHmVIs75W+DPRkxVjImDmPLlQSDNuQFKBGATL5rnx7UzgT7t6CZhG+aPr50VVuC/3IL1+Ok85DjT/LnOKaao3r+Wd+HMFVViM=
 notifications:
   webhooks: http://build.servo.org:54856/travis

+ 1 - 13
Makefile

@@ -2,16 +2,4 @@ test:
 	cargo test --features "query_encoding serde rustc-serialize"
 	[ x$$TRAVIS_RUST_VERSION != xnightly ] || cargo test --features heapsize
 
-doc:
-	cargo doc --features "query_encoding serde rustc-serialize"
-	@echo '<meta http-equiv=refresh content=0;url=url/index.html>' > target/doc/index.html
-	@cp github.png target/doc/
-
-upload-doc: doc
-	test "$(TRAVIS_BRANCH)" = master
-	test "$(TRAVIS_PULL_REQUEST)" = false
-	sudo pip install ghp-import
-	ghp-import -n target/doc
-	@git push -qf https://$(TOKEN)@github.com/$(TRAVIS_REPO_SLUG).git gh-pages
-
-.PHONY: test doc upload-doc
+.PHONY: test

+ 1 - 1
README.md

@@ -5,6 +5,6 @@ rust-url
 
 URL library for Rust, based on the [URL Standard](https://url.spec.whatwg.org/).
 
-[Documentation](https://servo.github.io/rust-url/url/index.html)
+[Documentation](https://docs.rs/url/*/url/)
 
 Please see [UPGRADING.md](https://github.com/servo/rust-url/blob/master/UPGRADING.md) if you are upgrading from 0.x to 1.x.