Skip to content

[stable] Update cargo to fix breakage on macOS High Sierra; Update version to 1.22.1. #46183

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

Merged
merged 2 commits into from
Nov 23, 2017
Merged

[stable] Update cargo to fix breakage on macOS High Sierra; Update version to 1.22.1. #46183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
027dc20
[stable] Update cargo.
kennytm Nov 22, 2017
a9749ef
Update release version
kennytm Nov 22, 2017
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
2 changes: 1 addition & 1 deletion src/bootstrap/channel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use Build;
use config::Config;

// The version number
pub const CFG_RELEASE_NUM: &str = "1.22.0";
pub const CFG_RELEASE_NUM: &str = "1.22.1";

// An optional number to put after the label, e.g. '.2' -> '-beta.2'
// Be sure to make this starts with a dot to conform to semver pre-release
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Open in desktop
Submodule cargo updated 3 files
+20 −7 src/cargo/ops/cargo_rustc/mod.rs
+7 −0 tests/build.rs
+4 −5 tests/cargotest/support/paths.rs