diff options
| author | Stefan Lankes <slankes@eonerc.rwth-aachen.de> | 2019-10-25 09:09:55 +0200 |
|---|---|---|
| committer | Stefan Lankes <slankes@eonerc.rwth-aachen.de> | 2019-10-25 09:09:55 +0200 |
| commit | d349e32fc70da197918256c29a0858fe7e1a6588 (patch) | |
| tree | 17f268176d32a172c84e84c30303a4794f4513b0 /src/libsyntax/parse/parser.rs | |
| parent | ddcd157d03a067419d7f5b4375cfaff5a474856a (diff) | |
| parent | d54111afc061ef398cd8ce28984f9e8d70001b24 (diff) | |
| download | rust-d349e32fc70da197918256c29a0858fe7e1a6588.tar.gz rust-d349e32fc70da197918256c29a0858fe7e1a6588.zip | |
Merge branch 'master' into rusty-hermit, resolve conflicts
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 6bbd8be0cb9..2ce0046ca27 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -86,13 +86,6 @@ macro_rules! maybe_recover_from_interpolated_ty_qpath { } } -fn maybe_append(mut lhs: Vec<Attribute>, mut rhs: Option<Vec<Attribute>>) -> Vec<Attribute> { - if let Some(ref mut rhs) = rhs { - lhs.append(rhs); - } - lhs -} - #[derive(Debug, Clone, Copy, PartialEq)] enum PrevTokenKind { DocComment, |