Skip to content

Commit 5c6aa46

Browse files
committed
Auto merge of #6692 - euclio:unused-comments, r=dwijnand
convert unused doc comments to regular comments rust-lang/rust#57882 will cause the unused_doc_comments lint to fire when doc comments are present on macro expansions, where they aren't used. Since cargo uses `#![deny(warnings)]` in tests, the tests fail to build with that change. This PR changes the unused doc comments to be regular comments so the warning isn't triggered. It would be helpful to update cargo in the rust repo after this change, since this blocks the above PR from landing.
2 parents 469af67 + f5723e5 commit 5c6aa46

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

src/cargo/core/features.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -150,17 +150,17 @@ macro_rules! stab {
150150
};
151151
}
152152

153-
/// A listing of all features in Cargo
154-
///
155-
/// "look here"
156-
///
157-
/// This is the macro that lists all stable and unstable features in Cargo.
158-
/// You'll want to add to this macro whenever you add a feature to Cargo, also
159-
/// following the directions above.
160-
///
161-
/// Note that all feature names here are valid Rust identifiers, but the `_`
162-
/// character is translated to `-` when specified in the `cargo-features`
163-
/// manifest entry in `Cargo.toml`.
153+
// A listing of all features in Cargo.
154+
//
155+
// "look here"
156+
//
157+
// This is the macro that lists all stable and unstable features in Cargo.
158+
// You'll want to add to this macro whenever you add a feature to Cargo, also
159+
// following the directions above.
160+
//
161+
// Note that all feature names here are valid Rust identifiers, but the `_`
162+
// character is translated to `-` when specified in the `cargo-features`
163+
// manifest entry in `Cargo.toml`.
164164
features! {
165165
pub struct Features {
166166

tests/testsuite/resolve.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ use crate::support::resolver::{
1414

1515
use proptest::{prelude::*, *};
1616

17-
/// NOTE: proptest is a form of fuzz testing. It generates random input and makes sure that
18-
/// certain universal truths are upheld. Therefore, it can pass when there is a problem,
19-
/// but if it fails then there really is something wrong. When testing something as
20-
/// complicated as the resolver, the problems can be very subtle and hard to generate.
21-
/// We have had a history of these tests only failing on PRs long after a bug is introduced.
22-
/// If you have one of these test fail please report it on #6258,
23-
/// and if you did not change the resolver then feel free to retry without concern.
17+
// NOTE: proptest is a form of fuzz testing. It generates random input and makes sure that
18+
// certain universal truths are upheld. Therefore, it can pass when there is a problem,
19+
// but if it fails then there really is something wrong. When testing something as
20+
// complicated as the resolver, the problems can be very subtle and hard to generate.
21+
// We have had a history of these tests only failing on PRs long after a bug is introduced.
22+
// If you have one of these test fail please report it on #6258,
23+
// and if you did not change the resolver then feel free to retry without concern.
2424
proptest! {
2525
#![proptest_config(ProptestConfig {
2626
max_shrink_iters:

0 commit comments

Comments
 (0)