Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Rust to 1.48 #4866

Merged
merged 7 commits into from
Nov 23, 2020
Merged

Update Rust to 1.48 #4866

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f1bf62f
Update rust toolchain to 1.48
quodlibetor Nov 23, 2020
b040920
Update bin/doc now that stable rustc does intra-doc links
quodlibetor Nov 23, 2020
3064858
Update linked-hash-map
quodlibetor Nov 23, 2020
415b1e8
Handle new clippy lint unnecessary_lazy_evaluations
quodlibetor Nov 23, 2020
eb5e3bc
Handle new clippy lint manual_strip
quodlibetor Nov 23, 2020
137cb90
Handle new clippy lint needless_return
quodlibetor Nov 23, 2020
d059b97
Handle new clippy lint single_char_push_str
quodlibetor Nov 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 7 additions & 16 deletions bin/doc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,18 @@ cd "$(dirname "$0")/.."

. misc/shlib/shlib.bash

rustup=1
for arg
do
case "$arg" in
--rustup) rustup=1 ;;
--rustup=*) die "--rustup option does not take an argument" ;;
--no-rustup) rustup= ;;
--no-rustup=*) die "--no-rustup option does not take an argument" ;;
-h|--help)
printf "usage: %s\n\nBuild the rust documentation site\n" "$0"
exit 0
;;
-*) die "unknown option $arg" ;;
*) die "usage: $0 [--rustup|--no-rustup]" ;;
*) die "usage: $0" ;;
esac
done

cargo() {
if [[ "$rustup" ]]; then
command cargo +nightly "$@"
else
command cargo "$@"
fi
}

# Use nightly until stable supports intra-Rustdoc links.
# https://github.com/rust-lang/rust/issues/43466
cargo doc

crates=$(cargo metadata --format-version=1 \
Expand Down Expand Up @@ -132,3 +121,5 @@ if (el.href != "index.html") {
el.href = "../index.html";
}
EOF

echo "Docs are in target/doc/index.html"
2 changes: 1 addition & 1 deletion ci/builder/stable.stamp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.47.0-20201118-154151
1.48.0-20201123-142044
2 changes: 1 addition & 1 deletion ci/deploy/devsite.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

set -euo pipefail

bin/doc --no-rustup
bin/doc
bin/pydoc
rsync misc/www/index.html [email protected]:/var/www/html/index.html
rsync --archive target/doc/ [email protected]:/var/www/html/api/rust
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.47.0
1.48.0