summaryrefslogtreecommitdiff
path: root/src/syntax
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2021-07-08 21:16:16 +0200
committerLaurenz <laurmaedje@gmail.com>2021-07-08 21:16:16 +0200
commit551e3af9d09a03aaa246cac46b98124bc10835ba (patch)
treeb075a93df7cb608eae9650e497fb6a1336d80212 /src/syntax
parent5c327e249e03ac303e7fef40e2df6c6ef834db66 (diff)
Replace using with from
Diffstat (limited to 'src/syntax')
-rw-r--r--src/syntax/expr.rs4
-rw-r--r--src/syntax/token.rs6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/syntax/expr.rs b/src/syntax/expr.rs
index f5b79122..c4462ff8 100644
--- a/src/syntax/expr.rs
+++ b/src/syntax/expr.rs
@@ -59,7 +59,7 @@ pub enum Expr {
While(WhileExpr),
/// A for loop expression: `for x in y { z }`.
For(ForExpr),
- /// An import expression: `import "utils.typ" using a, b, c`.
+ /// An import expression: `import a, b, c from "utils.typ"`.
Import(ImportExpr),
/// An include expression: `include "chapter1.typ"`.
Include(IncludeExpr),
@@ -466,7 +466,7 @@ pub struct LetExpr {
pub init: Option<Box<Expr>>,
}
-/// An import expression: `import "utils.typ" using a, b, c`.
+/// An import expression: `import a, b, c from "utils.typ"`.
#[derive(Debug, Clone, PartialEq)]
pub struct ImportExpr {
/// The source code location.
diff --git a/src/syntax/token.rs b/src/syntax/token.rs
index 425dac10..c14cf9f7 100644
--- a/src/syntax/token.rs
+++ b/src/syntax/token.rs
@@ -101,8 +101,8 @@ pub enum Token<'s> {
Import,
/// The `include` keyword.
Include,
- /// The `using` keyword.
- Using,
+ /// The `from` keyword.
+ From,
/// One or more whitespace characters.
///
/// The contained `usize` denotes the number of newlines that were contained
@@ -254,7 +254,7 @@ impl<'s> Token<'s> {
Self::Return => "keyword `return`",
Self::Import => "keyword `import`",
Self::Include => "keyword `include`",
- Self::Using => "keyword `using`",
+ Self::From => "keyword `from`",
Self::Space(_) => "space",
Self::Text(_) => "text",
Self::UnicodeEscape(_) => "unicode escape sequence",