Skip to content

Commit

Permalink
Beta: bootstrap from 1.24.0 stable.
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark-Simulacrum committed Feb 13, 2018
1 parent 4d2d3fc commit 99fddf3
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 30 deletions.
60 changes: 36 additions & 24 deletions src/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ fi
#
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
# either automatically or manually.
export RUST_RELEASE_CHANNEL=nightly
export RUST_RELEASE_CHANNEL=beta
if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL"
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"
Expand Down
8 changes: 4 additions & 4 deletions src/stage0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
# source tarball for a stable release you'll likely see `1.x.0` for rustc and
# `0.x.0` for Cargo where they were released on `date`.

date: 2018-01-02
rustc: beta
cargo: beta
date: 2018-02-12
rustc: 1.24.0
cargo: 0.25.0

# When making a stable release the process currently looks like:
#
Expand All @@ -34,4 +34,4 @@ cargo: beta
# looking at a beta source tarball and it's uncommented we'll shortly comment it
# out.

#dev: 1
dev: 1
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 47 files
+5 −4 Cargo.toml
+3 −1 README.md
+7 −10 src/bin/init.rs
+4 −8 src/bin/new.rs
+4 −4 src/bin/search.rs
+40 −0 src/cargo/core/features.rs
+16 −3 src/cargo/core/manifest.rs
+1 −1 src/cargo/core/mod.rs
+3 −2 src/cargo/core/package.rs
+60 −58 src/cargo/core/resolver/mod.rs
+1 −1 src/cargo/core/summary.rs
+1 −0 src/cargo/lib.rs
+4 −1 src/cargo/ops/cargo_doc.rs
+51 −87 src/cargo/ops/cargo_new.rs
+4 −2 src/cargo/ops/cargo_rustc/compilation.rs
+7 −6 src/cargo/ops/cargo_rustc/context.rs
+10 −2 src/cargo/ops/cargo_rustc/fingerprint.rs
+21 −5 src/cargo/ops/cargo_rustc/mod.rs
+2 −2 src/cargo/ops/registry.rs
+2 −2 src/cargo/sources/path.rs
+1 −1 src/cargo/sources/registry/index.rs
+6 −2 src/cargo/sources/registry/remote.rs
+17 −7 src/cargo/util/config.rs
+24 −0 src/cargo/util/graph.rs
+0 −74 src/cargo/util/lazy_cell.rs
+0 −2 src/cargo/util/mod.rs
+14 −10 src/cargo/util/read2.rs
+24 −5 src/cargo/util/toml/mod.rs
+1 −1 src/doc/src/getting-started/first-steps.md
+2 −4 src/doc/src/guide/creating-a-new-project.md
+5 −3 src/doc/src/reference/manifest.md
+52 −7 tests/build.rs
+1 −1 tests/cargotest/Cargo.toml
+2 −2 tests/cargotest/lib.rs
+1 −1 tests/cargotest/support/mod.rs
+2 −2 tests/cargotest/support/registry.rs
+1 −1 tests/death.rs
+4 −4 tests/directory.rs
+34 −0 tests/doc.rs
+25 −0 tests/generate-lockfile.rs
+1 −32 tests/new.rs
+117 −4 tests/package.rs
+28 −2 tests/path.rs
+16 −13 tests/registry.rs
+141 −3 tests/resolve.rs
+4 −4 tests/search.rs
+50 −1 tests/workspaces.rs

0 comments on commit 99fddf3

Please sign in to comment.