From 64f350ff9c7ae4ddbaed7ab4b7ef8923d4ef89fa Mon Sep 17 00:00:00 2001 From: David Barsky Date: Tue, 17 May 2022 17:28:43 -0400 Subject: [PATCH 01/14] chore: add Netlify doc previews --- netlify.toml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 netlify.toml diff --git a/netlify.toml b/netlify.toml new file mode 100644 index 00000000000..474c9c7536b --- /dev/null +++ b/netlify.toml @@ -0,0 +1,15 @@ +[build] + command = """ + rustup install nightly --profile minimal \ + && cargo doc --no-deps --all-features + """ + publish = "target/doc" + +[build.environment] + RUSTDOCFLAGS=""" + -D warnings \ + --cfg docsrs \ + --html-before-content /opt/build/repo/assets/warning.html \ + --html-in-header /opt/build/repo/assets/noindex.html \ + --extend-css /opt/build/repo/assets/warning.css \ + """ \ No newline at end of file From c649eb765ea2754c4816eaa64c8837531ec5da26 Mon Sep 17 00:00:00 2001 From: David Barsky Date: Tue, 17 May 2022 17:53:57 -0400 Subject: [PATCH 02/14] another commit --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 474c9c7536b..f12ea91a803 100644 --- a/netlify.toml +++ b/netlify.toml @@ -12,4 +12,4 @@ --html-before-content /opt/build/repo/assets/warning.html \ --html-in-header /opt/build/repo/assets/noindex.html \ --extend-css /opt/build/repo/assets/warning.css \ - """ \ No newline at end of file + """ From 99c8a4bcff0a8fcba32e7b97c6e64fd2331fc472 Mon Sep 17 00:00:00 2001 From: David Barsky Date: Wed, 18 May 2022 11:46:03 -0400 Subject: [PATCH 03/14] test --- netlify.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/netlify.toml b/netlify.toml index f12ea91a803..d32db752b84 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,7 +1,6 @@ [build] command = """ - rustup install nightly --profile minimal \ - && cargo doc --no-deps --all-features + rustup install nightly --profile minimal && cargo doc """ publish = "target/doc" From eef4adbabb11c621c6dd4b7ad4ed15075a573208 Mon Sep 17 00:00:00 2001 From: David Barsky Date: Wed, 18 May 2022 12:20:47 -0400 Subject: [PATCH 04/14] Update netlify.toml Co-authored-by: Eliza Weisman --- netlify.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/netlify.toml b/netlify.toml index d32db752b84..bf4e2077ccd 100644 --- a/netlify.toml +++ b/netlify.toml @@ -8,7 +8,4 @@ RUSTDOCFLAGS=""" -D warnings \ --cfg docsrs \ - --html-before-content /opt/build/repo/assets/warning.html \ - --html-in-header /opt/build/repo/assets/noindex.html \ - --extend-css /opt/build/repo/assets/warning.css \ """ From 3301570143738e7d7de9361430c58bdd951192fb Mon Sep 17 00:00:00 2001 From: David Barsky Date: Wed, 18 May 2022 12:24:50 -0400 Subject: [PATCH 05/14] Update netlify.toml Co-authored-by: Eliza Weisman --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index bf4e2077ccd..dc40d0963c9 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,6 +1,6 @@ [build] command = """ - rustup install nightly --profile minimal && cargo doc + rustup install nightly --profile minimal && cargo doc --no-deps """ publish = "target/doc" From 9cc2a5fe2184448e8186bf3539372c803acbb112 Mon Sep 17 00:00:00 2001 From: David Barsky Date: Wed, 18 May 2022 12:24:53 -0400 Subject: [PATCH 06/14] Update netlify.toml Co-authored-by: Eliza Weisman --- netlify.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/netlify.toml b/netlify.toml index dc40d0963c9..46f29ef51d5 100644 --- a/netlify.toml +++ b/netlify.toml @@ -9,3 +9,4 @@ -D warnings \ --cfg docsrs \ """ + RUSTFLAGS="--cfg tokio_unstable" From 0cd8cf69b11591940927d912e618866b6df3906a Mon Sep 17 00:00:00 2001 From: David Barsky Date: Wed, 18 May 2022 12:25:03 -0400 Subject: [PATCH 07/14] Update netlify.toml Co-authored-by: Eliza Weisman --- netlify.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/netlify.toml b/netlify.toml index 46f29ef51d5..90ad8c0b36a 100644 --- a/netlify.toml +++ b/netlify.toml @@ -8,5 +8,6 @@ RUSTDOCFLAGS=""" -D warnings \ --cfg docsrs \ + --cfg tokio_unstable \ """ RUSTFLAGS="--cfg tokio_unstable" From 41fa0936e3043e2b207aebf18478f53eacfc259c Mon Sep 17 00:00:00 2001 From: David Barsky Date: Wed, 18 May 2022 12:34:18 -0400 Subject: [PATCH 08/14] remove leading whitespace --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 90ad8c0b36a..4c8ba15dcf1 100644 --- a/netlify.toml +++ b/netlify.toml @@ -10,4 +10,4 @@ --cfg docsrs \ --cfg tokio_unstable \ """ - RUSTFLAGS="--cfg tokio_unstable" + RUSTFLAGS="--cfg tokio_unstable" From becdbe1f23d6119fe6d2ba04b54e2637fa83f0b3 Mon Sep 17 00:00:00 2001 From: David Barsky Date: Wed, 18 May 2022 13:01:41 -0400 Subject: [PATCH 09/14] switch to regular module system for macro resolution --- tokio/src/macros/join.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tokio/src/macros/join.rs b/tokio/src/macros/join.rs index ab85cdec26f..9697936c895 100644 --- a/tokio/src/macros/join.rs +++ b/tokio/src/macros/join.rs @@ -12,7 +12,7 @@ /// for **all** branches complete regardless if any complete with `Err`. Use /// [`try_join!`] to return early when `Err` is encountered. /// -/// [`try_join!`]: macro@try_join +/// [`try_join!`]: crate::try_join /// /// # Notes /// From 6bbd913e90e697f88eaa15620bc0c962c47babb9 Mon Sep 17 00:00:00 2001 From: David Barsky Date: Wed, 18 May 2022 13:19:40 -0400 Subject: [PATCH 10/14] add redirect to tokio subdirectory --- netlify.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/netlify.toml b/netlify.toml index 4c8ba15dcf1..e451a091cff 100644 --- a/netlify.toml +++ b/netlify.toml @@ -11,3 +11,7 @@ --cfg tokio_unstable \ """ RUSTFLAGS="--cfg tokio_unstable" + +[[redirects]] + from = "/" + to = "/tokio" From 1bc470e449531ddb7ba470d8442358ee04e829d4 Mon Sep 17 00:00:00 2001 From: David Barsky Date: Wed, 18 May 2022 13:57:54 -0400 Subject: [PATCH 11/14] Update netlify.toml Co-authored-by: Eliza Weisman --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index e451a091cff..c8d46dadbd3 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,6 +1,6 @@ [build] command = """ - rustup install nightly --profile minimal && cargo doc --no-deps + rustup install nightly --profile minimal && cargo doc --no-deps --features full """ publish = "target/doc" From 6b2946a39fce877bf0a9eb80c932ec33f52b5f93 Mon Sep 17 00:00:00 2001 From: David Barsky Date: Wed, 18 May 2022 13:58:00 -0400 Subject: [PATCH 12/14] Update netlify.toml Co-authored-by: Eliza Weisman --- netlify.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index c8d46dadbd3..e78d0ef8873 100644 --- a/netlify.toml +++ b/netlify.toml @@ -6,7 +6,6 @@ [build.environment] RUSTDOCFLAGS=""" - -D warnings \ --cfg docsrs \ --cfg tokio_unstable \ """ From eaf3ec367d48ae6c38a935dc953e29fd9e62f880 Mon Sep 17 00:00:00 2001 From: David Barsky Date: Wed, 18 May 2022 15:20:53 -0400 Subject: [PATCH 13/14] Update netlify.toml Co-authored-by: Alice Ryhl --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index e78d0ef8873..6712284d4f9 100644 --- a/netlify.toml +++ b/netlify.toml @@ -9,7 +9,7 @@ --cfg docsrs \ --cfg tokio_unstable \ """ - RUSTFLAGS="--cfg tokio_unstable" + RUSTFLAGS="--cfg tokio_unstable --cfg docsrs" [[redirects]] from = "/" From e3e7d68007315291c5af1fa7f24838366c06a793 Mon Sep 17 00:00:00 2001 From: David Barsky Date: Wed, 18 May 2022 15:20:56 -0400 Subject: [PATCH 14/14] Update netlify.toml Co-authored-by: Alice Ryhl --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 6712284d4f9..5705ce0d13a 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,6 +1,6 @@ [build] command = """ - rustup install nightly --profile minimal && cargo doc --no-deps --features full + rustup install nightly --profile minimal && cargo doc --no-deps --all-features """ publish = "target/doc"