Skip to content

/cargo

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.

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

Move Cargo onto stable Rust #1712

Merged
merged 1 commit into from Jun 17, 2015

Conversation

Reviewers
No reviews
Assignees

@huonw huonw

Labels
None yet
Projects
None yet
Milestone
No milestone
7 participants
@alexcrichton @rust-highfive @brson @bors @chris-morgan @retep998 @huonw
@alexcrichton
Copy link
Member

alexcrichton commented Jun 13, 2015

This commit moves Cargo onto 100% stable Rust now that the necessary fs features
have been stabilized. The tests were updated to understand when they're running
with a non-nightly compiler and disable all plugin-related tests. The only major
feature here is that the calls to fs::set_file_times were reimplemented
manually in the tests that Cargo has.

Cargo still requires a nightly compiler due to the stable features not having
made their way into the stable channel yet, but it will soon work on all of the
stable, beta, and nightly compilers once 1.1 is released!

@rust-highfive rust-highfive assigned huonw Jun 13, 2015

@rust-highfive

This comment has been minimized.

Sign in to view
Copy link

rust-highfive commented Jun 13, 2015

r? @huonw

(rust_highfive has picked a reviewer for you, use r? to override)
tests/support/paths.rs Outdated

#[cfg(windows)]
fn set_file_times(p: &Path, atime: u64, mtime: u64) -> io::Result<()> {
extern crate kernel32;

This comment has been minimized.

Sign in to view
Copy link
@retep998

retep998 Jun 13, 2015

Member

😈

@alexcrichton alexcrichton force-pushed the alexcrichton:run-cargo-on-stable branch from bbe4bec to 02293e9 Jun 14, 2015

tests/tests.rs Outdated
@@ -58,3 +58,7 @@ mod test_shell;
fn rustc_host() -> String {
cargo::ops::rustc_version("rustc").unwrap().1
}

fn is_nightly() -> bool {
cargo::ops::rustc_version("rustc").unwrap().0.contains("-nightly")

This comment has been minimized.

Sign in to view
Copy link
@chris-morgan

chris-morgan Jun 14, 2015

Member

Would not a development build (-dev) would satisfy the intent of the is_nightly check also (viz. using unstable features)?

@wizeman wizeman referenced this pull request Jun 16, 2015

Closed

`rustPlatform` builds Rust Twice at different versions #7969

@brson

This comment has been minimized.

Sign in to view
Copy link
Contributor

brson commented Jun 16, 2015

r=me with @chris-morgan's comment addressed.

@alexcrichton alexcrichton force-pushed the alexcrichton:run-cargo-on-stable branch from 02293e9 to dab6e56 Jun 16, 2015

@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member Author

alexcrichton commented Jun 16, 2015

@bors: r=brson dab6e56
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jun 16, 2015

⌛️ Testing commit dab6e56 with merge 832d9f6...

bors added a commit that referenced this pull request Jun 16, 2015

@bors
Auto merge of #1712 - alexcrichton:run-cargo-on-stable, r=brson 
This commit moves Cargo onto 100% stable Rust now that the necessary fs features
have been stabilized. The tests were updated to understand when they're running
with a non-nightly compiler and disable all plugin-related tests. The only major
feature here is that the calls to `fs::set_file_times` were reimplemented
manually in the tests that Cargo has.

Cargo still requires a *nightly compiler* due to the stable features not having
made their way into the stable channel yet, but it will soon work on all of the
stable, beta, and nightly compilers once 1.1 is released!
832d9f6
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jun 16, 2015

💔 Test failed - cargo-win-gnu-64

@alexcrichton alexcrichton force-pushed the alexcrichton:run-cargo-on-stable branch from dab6e56 to 8453a90 Jun 17, 2015

@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member Author

alexcrichton commented Jun 17, 2015

@bors: r=brson 8453a90
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jun 17, 2015

⌛️ Testing commit 8453a90 with merge 3bfcc7b...

bors added a commit that referenced this pull request Jun 17, 2015

@bors
Auto merge of #1712 - alexcrichton:run-cargo-on-stable, r=brson 
This commit moves Cargo onto 100% stable Rust now that the necessary fs features
have been stabilized. The tests were updated to understand when they're running
with a non-nightly compiler and disable all plugin-related tests. The only major
feature here is that the calls to `fs::set_file_times` were reimplemented
manually in the tests that Cargo has.

Cargo still requires a *nightly compiler* due to the stable features not having
made their way into the stable channel yet, but it will soon work on all of the
stable, beta, and nightly compilers once 1.1 is released!
3bfcc7b
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jun 17, 2015

💔 Test failed - cargo-win-gnu-32

@alexcrichton alexcrichton force-pushed the alexcrichton:run-cargo-on-stable branch from 8453a90 to 7c2d1a5 Jun 17, 2015

@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member Author

alexcrichton commented Jun 17, 2015

@bors: r=brson

On Tue, Jun 16, 2015 at 10:16 PM, bors notifications@github.com wrote:

[image: 💔] Test failed - cargo-win-gnu-32
http://buildbot.rust-lang.org/builders/cargo-win-gnu-32/builds/43

—
Reply to this email directly or view it on GitHub
#1712 (comment).
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jun 17, 2015

📌 Commit 7c2d1a5 has been approved by brson
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jun 17, 2015

⌛️ Testing commit 7c2d1a5 with merge 08199c0...

bors added a commit that referenced this pull request Jun 17, 2015

@bors
Auto merge of #1712 - alexcrichton:run-cargo-on-stable, r=brson 
This commit moves Cargo onto 100% stable Rust now that the necessary fs features
have been stabilized. The tests were updated to understand when they're running
with a non-nightly compiler and disable all plugin-related tests. The only major
feature here is that the calls to `fs::set_file_times` were reimplemented
manually in the tests that Cargo has.

Cargo still requires a *nightly compiler* due to the stable features not having
made their way into the stable channel yet, but it will soon work on all of the
stable, beta, and nightly compilers once 1.1 is released!
08199c0
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jun 17, 2015

💔 Test failed - cargo-win-gnu-64
@alexcrichton
Move Cargo onto stable Rust 
This commit moves Cargo onto 100% stable Rust now that the necessary fs features
have been stabilized. The tests were updated to understand when they're running
with a non-nightly compiler and disable all plugin-related tests. The only major
feature here is that the calls to `fs::set_file_times` were reimplemented
manually in the tests that Cargo has.

Cargo still requires a *nightly compiler* due to the stable features not having
made their way into the stable channel yet, but it will soon work on all of the
stable, beta, and nightly compilers once 1.1 is released!
Loading status checks…
23762e4

@alexcrichton alexcrichton force-pushed the alexcrichton:run-cargo-on-stable branch from 7c2d1a5 to 23762e4 Jun 17, 2015

@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member Author

alexcrichton commented Jun 17, 2015

@bors: r=brson

On Tue, Jun 16, 2015 at 10:30 PM, bors notifications@github.com wrote:

[image: 💔] Test failed - cargo-win-gnu-64
http://buildbot.rust-lang.org/builders/cargo-win-gnu-64/builds/46

—
Reply to this email directly or view it on GitHub
#1712 (comment).
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jun 17, 2015

📌 Commit 23762e4 has been approved by brson
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jun 17, 2015

⌛️ Testing commit 23762e4 with merge 35c05ae...

bors added a commit that referenced this pull request Jun 17, 2015

@bors
Auto merge of #1712 - alexcrichton:run-cargo-on-stable, r=brson 
This commit moves Cargo onto 100% stable Rust now that the necessary fs features
have been stabilized. The tests were updated to understand when they're running
with a non-nightly compiler and disable all plugin-related tests. The only major
feature here is that the calls to `fs::set_file_times` were reimplemented
manually in the tests that Cargo has.

Cargo still requires a *nightly compiler* due to the stable features not having
made their way into the stable channel yet, but it will soon work on all of the
stable, beta, and nightly compilers once 1.1 is released!
Loading status checks…
35c05ae
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jun 17, 2015

☀️ Test successful - cargo-linux-32, cargo-linux-64, cargo-mac-32, cargo-mac-64, cargo-win-gnu-32, cargo-win-gnu-64

@bors bors merged commit 23762e4 into rust-lang:master Jun 17, 2015
1 of 2 checks passed

1 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
homu Test successful
Details

@alexcrichton alexcrichton deleted the alexcrichton:run-cargo-on-stable branch Jun 24, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.