-
Notifications
You must be signed in to change notification settings - Fork 12.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rustpkg: Make crates, not packages, the unit of rustpkg dependencies
Treating a package as the thing that can have other packages depend on it, and depends on other packages, was wrong if a package has more than one crate. Now, rustpkg knows about dependencies between crates in the same package. This solves the problem reported in #7879 where rustpkg wrongly discovered a circular dependency between thhe package and itself, and recursed infinitely. Closes #7879
- Loading branch information
1 parent
4c6bf48
commit e199790
Showing
9 changed files
with
409 additions
and
249 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
pub static copy_failed_code: int = 65; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
e199790
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from brson
at catamorphism@e199790
e199790
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging catamorphism/rust/rustpkg-issue-7879 = e199790 into auto
e199790
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
catamorphism/rust/rustpkg-issue-7879 = e199790 merged ok, testing candidate = 36cc414
e199790
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/1558
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/1561
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/667
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/667
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/1577
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/668
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/668
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/1577
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/668
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/668
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/749
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/1562
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/667
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/668
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/1346
e199790
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding master to auto = 36cc414