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 | 01dbfb3eb264135c432cef223848416f90dac290 (patch) | |
| tree | 67e0a6d5e9a26aa88fe06b38651fe030d994f508 /compiler/rustc_parse/src/parser | |
| parent | d8e564715e0eb17130e99e8fcc92a36fce7feaf5 (diff) | |
| download | rust-01dbfb3eb264135c432cef223848416f90dac290.tar.gz rust-01dbfb3eb264135c432cef223848416f90dac290.zip | |
resolve the conflict in compiler/rustc_session/src/parse.rs
Signed-off-by: codehorseman <cricis@yeah.net>
Diffstat (limited to 'compiler/rustc_parse/src/parser')
| -rw-r--r-- | compiler/rustc_parse/src/parser/item.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_parse/src/parser/item.rs b/compiler/rustc_parse/src/parser/item.rs index b582f060395..028630b17c4 100644 --- a/compiler/rustc_parse/src/parser/item.rs +++ b/compiler/rustc_parse/src/parser/item.rs @@ -1948,7 +1948,7 @@ impl<'a> Parser<'a> { // We use an over-approximation here. // `const const`, `fn const` won't parse, but we're not stepping over other syntax either. // `pub` is added in case users got confused with the ordering like `async pub fn`, - // only if it wasn't preceeded by `default` as `default pub` is invalid. + // only if it wasn't preceded by `default` as `default pub` is invalid. let quals: &[Symbol] = if check_pub { &[kw::Pub, kw::Const, kw::Async, kw::Unsafe, kw::Extern] } else { |