Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 75cde3f

Browse files
committed
bless bootstrap tests
Signed-off-by: onur-ozkan <[email protected]>
1 parent 421aee9 commit 75cde3f

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/bootstrap/src/core/builder/tests.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ fn alias_and_path_for_library() {
234234
);
235235
assert_eq!(
236236
first(cache.all::<doc::Std>()),
237-
&[doc_std!(TEST_TRIPLE_1 => TEST_TRIPLE_1, stage = 0)]
237+
&[doc_std!(TEST_TRIPLE_1 => TEST_TRIPLE_1, stage = 1)]
238238
);
239239
}
240240

@@ -392,14 +392,14 @@ mod defaults {
392392
assert_eq!(first(cache.all::<doc::ErrorIndex>()), &[doc::ErrorIndex { target: a },]);
393393
assert_eq!(
394394
first(cache.all::<tool::ErrorIndex>()),
395-
&[tool::ErrorIndex { compiler: Compiler::new(0, a) }]
395+
&[tool::ErrorIndex { compiler: Compiler::new(1, a) }]
396396
);
397397
// docs should be built with the beta compiler, not with the stage0 artifacts.
398398
// recall that rustdoc is off-by-one: `stage` is the compiler rustdoc is _linked_ to,
399399
// not the one it was built by.
400400
assert_eq!(
401401
first(cache.all::<tool::Rustdoc>()),
402-
&[tool::Rustdoc { compiler: Compiler::new(0, a) },]
402+
&[tool::Rustdoc { compiler: Compiler::new(1, a) },]
403403
);
404404
}
405405
}

src/bootstrap/src/utils/helpers.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,7 @@ pub fn dir_is_empty(dir: &Path) -> bool {
415415
/// the "y" part from the string.
416416
pub fn extract_beta_rev(version: &str) -> Option<String> {
417417
let parts = version.splitn(2, "-beta.").collect::<Vec<_>>();
418+
#[allow(clippy::let_and_return)]
418419
let count = parts.get(1).and_then(|s| s.find(' ').map(|p| s[..p].to_string()));
419420

420421
count

0 commit comments

Comments
 (0)