Skip to content

Commit

Permalink
deps: bump rustc-ap crates to v701.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
calebcartwright committed Feb 4, 2021
1 parent ead937b commit 58ac85b
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 54 deletions.
83 changes: 41 additions & 42 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,36 +66,36 @@ rustc-workspace-hack = "1.0.0"

[dependencies.rustc_ast]
package = "rustc-ap-rustc_ast"
version = "697.0.0"
version = "701.0.0"

[dependencies.rustc_ast_pretty]
package = "rustc-ap-rustc_ast_pretty"
version = "697.0.0"
version = "701.0.0"

[dependencies.rustc_attr]
package = "rustc-ap-rustc_attr"
version = "697.0.0"

[dependencies.rustc_data_structures]
package = "rustc-ap-rustc_data_structures"
version = "697.0.0"
version = "701.0.0"

[dependencies.rustc_errors]
package = "rustc-ap-rustc_errors"
version = "697.0.0"
version = "701.0.0"

[dependencies.rustc_expand]
package = "rustc-ap-rustc_expand"
version = "697.0.0"
version = "701.0.0"

[dependencies.rustc_parse]
package = "rustc-ap-rustc_parse"
version = "697.0.0"
version = "701.0.0"

[dependencies.rustc_session]
package = "rustc-ap-rustc_session"
version = "697.0.0"
version = "701.0.0"

[dependencies.rustc_span]
package = "rustc-ap-rustc_span"
version = "697.0.0"
version = "701.0.0"
4 changes: 2 additions & 2 deletions src/macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use rustc_ast::token::{BinOpToken, DelimToken, Token, TokenKind};
use rustc_ast::tokenstream::{Cursor, LazyTokenStream, TokenStream, TokenTree};
use rustc_ast::{ast, ptr};
use rustc_ast_pretty::pprust;
use rustc_parse::parser::Parser;
use rustc_parse::parser::{ForceCollect, Parser};
use rustc_parse::{stream_to_parser, MACRO_ARGUMENTS};
use rustc_span::{
symbol::{self, kw},
Expand Down Expand Up @@ -138,7 +138,7 @@ fn parse_macro_arg<'a, 'b: 'a>(parser: &'a mut Parser<'b>) -> Option<MacroArg> {
// `parse_item` returns `Option<ptr::P<ast::Item>>`.
parse_macro_arg!(
Item,
|parser: &mut rustc_parse::parser::Parser<'b>| parser.parse_item(),
|parser: &mut rustc_parse::parser::Parser<'b>| parser.parse_item(ForceCollect::No),
|x: Option<ptr::P<ast::Item>>| x
);

Expand Down
7 changes: 5 additions & 2 deletions src/syntux/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ use std::path::{Path, PathBuf};
use rustc_ast::ast;
use rustc_ast::token::{DelimToken, TokenKind};
use rustc_errors::Diagnostic;
use rustc_parse::{new_parser_from_file, parser::Parser as RawParser};
use rustc_parse::{
new_parser_from_file,
parser::{ForceCollect, Parser as RawParser},
};
use rustc_span::{sym, symbol::kw, Span};

use crate::attr::first_attr_value_str_by_name;
Expand Down Expand Up @@ -247,7 +250,7 @@ impl<'a> Parser<'a> {
while parser.token != TokenKind::CloseDelim(DelimToken::Brace)
&& parser.token.kind != TokenKind::Eof
{
let item = match parser.parse_item() {
let item = match parser.parse_item(ForceCollect::No) {
Ok(Some(item_ptr)) => item_ptr.into_inner(),
Ok(None) => continue,
Err(mut err) => {
Expand Down

0 comments on commit 58ac85b

Please sign in to comment.