diff options
| author | codehorseman <cricis@yeah.net> | 2022-03-16 20:12:30 +0800 |
|---|---|---|
| committer | codehorseman <cricis@yeah.net> | 2022-03-16 20:12:30 +0800 |
| commit | c0861d3a9d33d535542bbeb48d35271161c87ebf (patch) | |
| tree | a4d72f0d1615bd298adf7020b54f703a336bccd7 | |
| parent | a918d8b55bd7ec9bbec0c01c1362e842342d7729 (diff) | |
| download | rust-c0861d3a9d33d535542bbeb48d35271161c87ebf.tar.gz rust-c0861d3a9d33d535542bbeb48d35271161c87ebf.zip | |
resolve the conflict in compiler/rustc_session/src/parse.rs
Signed-off-by: codehorseman <cricis@yeah.net>
| -rw-r--r-- | src/lists.rs | 2 | ||||
| -rw-r--r-- | src/types.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lists.rs b/src/lists.rs index 7aa0315f18c..29d75585eb7 100644 --- a/src/lists.rs +++ b/src/lists.rs @@ -575,7 +575,7 @@ where pub(crate) fn extract_pre_comment(pre_snippet: &str) -> (Option<String>, ListItemCommentStyle) { let trimmed_pre_snippet = pre_snippet.trim(); // Both start and end are checked to support keeping a block comment inline with - // the item, even if there are preceeding line comments, while still supporting + // the item, even if there are preceding line comments, while still supporting // a snippet that starts with a block comment but also contains one or more // trailing single line comments. // https://github.com/rust-lang/rustfmt/issues/3025 diff --git a/src/types.rs b/src/types.rs index 5de30129266..a49d473a13f 100644 --- a/src/types.rs +++ b/src/types.rs @@ -251,7 +251,7 @@ fn rewrite_segment( match **args { ast::GenericArgs::AngleBracketed(ref data) if !data.args.is_empty() => { // HACK: squeeze out the span between the identifier and the parameters. - // The hack is requried so that we don't remove the separator inside macro calls. + // The hack is required so that we don't remove the separator inside macro calls. // This does not work in the presence of comment, hoping that people are // sane about where to put their comment. let separator_snippet = context |