Use rdf-type 0.12.17 vocabulary::Scoped.

Cargo.toml

@@ -34,7 +34,7 @@ static-iref = "2.0"
 locspan = "0.7.11"
 locspan-derive = "0.6"
 codespan-reporting = "0.11"
-rdf-types = "0.12.16"
+rdf-types = "0.12.17"
 xsd-types = "0.5.5"
 grdf = "0.16.3"
 shelves = "1"

build/src/context/initialize.rs

@@ -7,9 +7,9 @@ use ::treeldr::{
 };
 use locspan::{Meta, Span};
 use nquads_syntax::Parse;
-use rdf_types::{Generator, VocabularyMut};
+use rdf_types::{generator::Unscoped, vocabulary::Scoped, Generator, VocabularyMut};
 
-use crate::{Document, ScopedGenerator, ScopedVocabulary};
+use crate::Document;
 
 use super::Context;
 
@@ -55,8 +55,8 @@ impl<M> Context<M> {
 	) where
 		M: Clone + Ord + Merge,
 	{
-		let mut scoped_vocabulary = ScopedVocabulary::new(vocabulary, scope);
-		let mut scoped_generator = ScopedGenerator(generator);
+		let mut scoped_vocabulary = Scoped::new(vocabulary, scope);
+		let mut unscoped_generator = Unscoped(generator);
 
 		let doc = nquads_syntax::Document::parse_str(content, metadata)
 			.ok()
@@ -74,11 +74,21 @@ impl<M> Context<M> {
 			.collect();
 
 		dataset
-			.declare(&mut (), self, &mut scoped_vocabulary, &mut scoped_generator)
+			.declare(
+				&mut (),
+				self,
+				&mut scoped_vocabulary,
+				&mut unscoped_generator,
+			)
 			.ok()
 			.unwrap();
 		dataset
-			.define(&mut (), self, &mut scoped_vocabulary, &mut scoped_generator)
+			.define(
+				&mut (),
+				self,
+				&mut scoped_vocabulary,
+				&mut unscoped_generator,
+			)
 			.ok()
 			.unwrap();
 	}

build/src/lib.rs

@@ -10,7 +10,6 @@ pub mod list;
 pub mod prop;
 pub mod rdf;
 pub mod resource;
-mod scope;
 mod single;
 pub mod ty;
 pub mod utils;
@@ -21,7 +20,6 @@ pub use layout::{ParentLayout, SubLayout};
 pub use list::{ListMut, ListRef};
 pub use multiple::Multiple;
 pub use prop::Property;
-pub use scope::*;
 pub use single::Single;
 pub use ty::Type;